Remove APN list stuff from here