Remove code branches providing compatibility with CF8 and lower