Marked deprecated classes / methods
Continued implem of consolidated step