Cleanup in plugin/