Remove hardcoded http assumption