Remove localhost hardcoding