Remove obsolete classes
Merge remote-tracking branch 'origin/NEXUS-7336-osecurity-step-2' into NEXUS-7336-osecurity-step-3