Refactor activity delete
Refactoring
Add polyfill for Simple Push API