MDL-31050 rss: removed some unused function parameters and removed some low value comments