OData metadata -> Csdl metadata + cleanup