Updated EF and removed old ObjectContext queries