Clean up directories, second try