Remove hardcoded URLs :)