Removed dead code. Took care of some tech debt
2 files changed