Defactored room references
Removed deprecated code