Comment out deprecated code