Eliminated last traces of current-room