Removed dead code.
Refactoring.