Task #59 Remove hardcoded URLs

@Tannheuser WTF???