Remove the plugin_ data convention