use same cleanup script as workbench
cleaned up a bit
need to remove the workbench code here