Revert "Apn settings fixes / code maintainence"

This reverts commit 424cd516d672eeb7b193bcb15b63a2984b8ce04c.