cleaning up builder