Updating to remove logging statement