mgmt cleanup