Removes unnecessary code and improves workbench support.
Merge pull request #429 from LearningLocker/issue/workbench

Removes unnecessary code and improves workbench support.