Removed dead code from last refactoring