cleanup
at least the tests pass