some clean up, latest notificare-push-lib