code review changes:
+ removed unused function