Clean-up use of plexus runtime annotations