Remove deprecated code (DEF)