Getting rid of deprecated mgmt commands