Update to remove ssl handling