Remove CMF 2.3 compat.