[!!!][TASK] Remove deprecated code at various places