[TASK] Clean up unnecessary code