Refactoring and moving towards using ObjectContext instead of DbContext