Cleaned up Room of Requirement Model