port create/update/deleteReferences to Hit

and other cleanup.