[TASK] Remove deprecated code