added room clean up