Clean up of plugin monkey patch