Merge pull request #3214 from RuiLi8080/MINOR-Nimbus

[MINOR] remove some unused fields and correct comment typo