cleanup part 1 of 2 before unit tests
cleanup part 2 of 2 before unit tests