Clean up CAO nametag handling and remove deprecated AO_CMD