Removed all previously deprecated code.