Cleanups in the plugins