Fixed new Android versions issues, removed GCM services