Wall removal *mostly* working