Merge pull request #3701 from howard0su/clean