Revert "Room Changes + DropZone"

This reverts commit 0f2b21eaef32a41830826fccc3571865e89ffef3.