hmm ... and by "deprecated" you seem to mean "discontinued" - support for them has been dropped and you'll get a warning message if you try to use them - or have I misunderstood something ?  You've deleted the code for NoteClassUsage and replaced it with a stub for something enterprise-specific, IIUC.  I wouldn't describe this as deprecation (advising folk to stop using it, although it still works for the present).