Removing use of plugin