Some updates to clean up plugins.