workbench: general cleanup