Small refactoring for unsed code