Fixing some plugin clean up