bootstrap cleanups