cleanup for passing build and tests