final cleanup, tests pass