[TASK] Remove legacy code