cleanup for mgmt-images changes