Remove gsm and cdma

We have moved to world phone and these were just there to give builds
some time to make the change.