Misc. plugin extraction clean up