Removed unnecessary dependency.
Refactoring.