Removed depreccated classes from workbench. Fixes #603