End of stay clean up