* Clean up some deprecated code