Removed remnants of building choosing