Remove deprecated code that was commented out.