Refactoring. RIP dead code.