NEXUS-7509: Removal of dead code

And some minot tweaks
Merge pull request #768 from sonatype/NEXUS-7509-dead-code-and-minor-tweaks

NEXUS-7509: Removal of dead code