Revert "Room"

This reverts commit cf7b42e7802dbf77083669b9ac3405768175c52e.