Cleaning up in plugin manager land