Removed some hardcoded URLs