Deprecated code removed.