As separate refactoring task, we don't need class here anymore.