CF cleanup part 2