Revert "Apn settings fixes / code maintainence"

This reverts commit b686f26f4a3ef0df40b5502eb4df36e0893a2901.