Remove OData dependency