Cleaned from SimplePush