Cleaned out deprecated code