code refactoring, remove unnecessarry method