[TASK] Remove obsolete code