more cleanup, tests pass