Changes for accommodate for testing apns endpoints
Deleting redundant code