Removed 1.1 create_cf code path