refactor(redundant code): removed redundant code, added todo marks

Mike Hoang requested to merge mike/redundant-code-refactor into master
Edited by Mike Hoang

Merge request reports