[Refactoring] Remove unused code