Refactor to play nice with unpushed apps