No leftover dirs during upgrade