[TASK] Remove unnecessary code