NXP-11966: Remove obsolete rules + missing class