removed cf7 and cf8 incompatibilities that were still lying around