cleaned up trinitybuilder to be used in vm