build cleanups from fresh machine