Remove some testing stuff, and make room list updates incremental