[Refactoring] Remove redundant code