Remove deprecated mgmt methods / classes