Cleaning up the building mechanism