Removal of deprecated code.