Clean up builder to be complete.