cleanup to properly handle and display gcm notifications