- remove unused hack to turn on extra suites based on current directory name
 - remove 4 your old debug printout of "vardir: <dir>"