Merge "Remove dead/obsolete carrier label code"