NEXUS-7509: Removal of dead code

And some minot tweaks

Issue
https://issues.sonatype.org/browse/NEXUS-7509

CI
TBD