issue #2905: remove redundant codes
Merge pull request #3934 from minggo/iss2905-adjust_folder

remove redundant codes