APN cleanup