Cleanup for cdma consolidation

Change-Id: I802078c5983daabe8913dad05b20d804e6b06533