Clean control_point.models. Need to test for inheritance, etc. Still needs bequeath.