Revert "WorldPhone Support"

This reverts commit a55901d940eddb59a37007e6b87c7e924e842fc3.

Change-Id: I46c66e0e167b243aceaca552c839258e559f47c3