total removal of deprecated code