Improve room deallocation

Now clears the expiration timer in case something else calls
`destroy()`. I've also removed `removeRoom()` since it doesn't
do anything anymore.