cleanup + OData/EF6 integration