clean up of building builder