further cleanup of build