Merge pull request #4442 from xfxyjwf/clean

Delete unused directories.