Further Directory Cleaning