build-related cleanups