Clean out deprecated code