minor changes to remove extraneous code discovered in port to OC