remove unnecessary enum MASCompositeConstraintType and misc tidy up