remove references to ObjMap, we don't nil MZero cases anymore we have Fail