CFY-768 revert cleanup