Remove TODOs from BuildingItem