Remove CF for now and revert Apps