Clean CFONB support