Revert "Apn settings fixes / code maintainence"

This reverts commit 6019c31bebfae09ea56b65789d4c145ede415353.

Change-Id: Idb63102a3a8f779e7ac06dd1d11033dea8ddd700