Further cleanup of building removal