Issue #2969106 by saranya purushothaman, markcarver: Replace methods in Attributes.cleanClass pass the identifier as a 3rd parameter