Merge pull request #1636 from apache/tristan/remove-plugins

Remove plugins