Cf refactor cleanup