Removed room identification from Block
Removed unnecessary Room requirement for all Blocks