Merge pull request #464 from eht16/undeprecate_plugins