[#1002] Some cleanups of the plugins since I was there