clean up ca mgmt patch