clean up object builders (prep for fixing dispose)