move another test
remove some dead code