Adding clean up for APNs Service class