Move all push code out of app