ROOMS-499: Cleaning code