remove self destruction, add push notifications