clean up bootstrap code and code coverage