all tests pass - major cleanup