Small refactoring, deleting useless methods