Removed bad logic from room related classes