more Model/ModelObject cleanups