Remove upload_path in favor of storage_path everywhere