NXP-11966: Remove rightsAddManager class and clean up