Remove hardcoded localhost