remove old stuff, add tests, add traceit