REVIEW: Remove use of Plexus (replace with JSR330 + ZT-zip)