Remove room correctly