Removing XCF specificity.