Remove deprecated code which is a trap to maintainers