Clean up plugins and remove non bundle packages