Did some cleaning. Disabled PushNotificationServices for now...