Cleanup device configs and update apns

Thanks CM for the updated apns