Code cleanup: remove unused code.
Code cleanup: replace explicit instance through injection (made code testable).