Work on notifying GCM ID to server
Cleanup unused code