directory cleaning improvements.
directory cleaning improvements.