CodeQuality: removed some unused lines of code, no functionality change.