ningyanhui

## Purpose of the pull request ## Brief change log ## Verify this pull request This pull request is code cleanup without any test coverage. *(or)* This pull request is...