Remove unnecessary and wasteful subdirs