Remove extra plugin support