another pass of cleanup of Contract objects.