Minor changes to remove deprecated code