REVIEW: Unpack cleanup

kills plexus annotations and some other minor cleanup.

https://issues.sonatype.org/browse/NEXUS-5908