Refactoring unused code.
11 files changed