Simplify CF version