Removed old toolbox code