[Refactor] Remove unnecessary code