Revert "Add multi-carrier MMS and MCC overlay"

This reverts commit 1825da87c202f22df2d22353d616a9b3915f7570.