Removed hardcoded urls