diff --git a/src/plugins/data/common/es_query/filters/exists_filter.ts b/src/plugins/data/common/es_query/filters/exists_filter.ts
index 9125048e5f6c..1a404ca41511 100644
--- a/src/plugins/data/common/es_query/filters/exists_filter.ts
+++ b/src/plugins/data/common/es_query/filters/exists_filter.ts
@@ -18,7 +18,7 @@
  */
 
 import { Filter, FilterMeta } from './meta_filter';
-import { IndexPattern, Field } from './types';
+import { IndexPattern, Field } from '../../types';
 
 export type ExistsFilterMeta = FilterMeta;
 
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.test.ts b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
index ec13e28c583d..250ec792fbb5 100644
--- a/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { buildInlineScriptForPhraseFilter, buildPhraseFilter } from './phrase_filter';
-import { IndexPattern } from './types';
+import { IndexPattern } from '../../types';
 import { getField } from '../__tests__/fields_mock';
 
 describe('Phrase filter builder', () => {
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.ts b/src/plugins/data/common/es_query/filters/phrase_filter.ts
index 15c5c9d4ad2e..35110c924fe6 100644
--- a/src/plugins/data/common/es_query/filters/phrase_filter.ts
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.ts
@@ -19,7 +19,7 @@
 
 import { get, isPlainObject } from 'lodash';
 import { Filter, FilterMeta } from './meta_filter';
-import { IndexPattern, Field } from './types';
+import { IndexPattern, Field } from '../../types';
 
 export type PhraseFilterMeta = FilterMeta & {
   params?: {
diff --git a/src/plugins/data/common/es_query/filters/phrases_filter.ts b/src/plugins/data/common/es_query/filters/phrases_filter.ts
index e4606695c0f6..e207a3ff5961 100644
--- a/src/plugins/data/common/es_query/filters/phrases_filter.ts
+++ b/src/plugins/data/common/es_query/filters/phrases_filter.ts
@@ -18,7 +18,7 @@
  */
 
 import { Filter, FilterMeta } from './meta_filter';
-import { Field, IndexPattern } from './types';
+import { Field, IndexPattern } from '../../types';
 import { getPhraseScript } from './phrase_filter';
 
 export type PhrasesFilterMeta = FilterMeta & {
diff --git a/src/plugins/data/common/es_query/filters/query_string_filter.test.ts b/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
index 839e4f635925..5a580db0c57b 100644
--- a/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
+++ b/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { buildQueryFilter } from './query_string_filter';
-import { IndexPattern } from './types';
+import { IndexPattern } from '../../types';
 
 describe('Phrase filter builder', () => {
   let indexPattern: IndexPattern;
diff --git a/src/plugins/data/common/es_query/filters/query_string_filter.ts b/src/plugins/data/common/es_query/filters/query_string_filter.ts
index 901dc724aa4e..d2374162b195 100644
--- a/src/plugins/data/common/es_query/filters/query_string_filter.ts
+++ b/src/plugins/data/common/es_query/filters/query_string_filter.ts
@@ -18,7 +18,7 @@
  */
 
 import { Filter, FilterMeta } from './meta_filter';
-import { IndexPattern } from './types';
+import { IndexPattern } from '../../types';
 
 export type QueryStringFilterMeta = FilterMeta;
 
diff --git a/src/plugins/data/common/es_query/filters/range_filter.test.ts b/src/plugins/data/common/es_query/filters/range_filter.test.ts
index 9008dc2a6729..017bb8e9cb7c 100644
--- a/src/plugins/data/common/es_query/filters/range_filter.test.ts
+++ b/src/plugins/data/common/es_query/filters/range_filter.test.ts
@@ -19,7 +19,7 @@
 
 import { each } from 'lodash';
 import { buildRangeFilter, RangeFilter } from './range_filter';
-import { IndexPattern, Field } from './types';
+import { IndexPattern, Field } from '../../types';
 import { getField } from '../__tests__/fields_mock';
 
 describe('Range filter builder', () => {
diff --git a/src/plugins/data/common/es_query/filters/range_filter.ts b/src/plugins/data/common/es_query/filters/range_filter.ts
index d7931f191e52..c2513a9dc0c5 100644
--- a/src/plugins/data/common/es_query/filters/range_filter.ts
+++ b/src/plugins/data/common/es_query/filters/range_filter.ts
@@ -18,7 +18,7 @@
  */
 import { map, reduce, mapValues, get, keys, pick } from 'lodash';
 import { Filter, FilterMeta } from './meta_filter';
-import { Field, IndexPattern } from './types';
+import { Field, IndexPattern } from '../../types';
 
 const OPERANDS_IN_RANGE = 2;
 
diff --git a/src/plugins/data/common/es_query/filters/types.ts b/src/plugins/data/common/es_query/filters/types.ts
index 281473506199..a242df4811c0 100644
--- a/src/plugins/data/common/es_query/filters/types.ts
+++ b/src/plugins/data/common/es_query/filters/types.ts
@@ -49,9 +49,3 @@ export enum FILTERS {
   GEO_BOUNDING_BOX = 'geo_bounding_box',
   GEO_POLYGON = 'geo_polygon',
 }
-
-// We can't import the real types from the data plugin, so need to either duplicate
-// them here or figure out another solution, perhaps housing them in this package
-// will be replaces after Fieds / IndexPattern will be moved into new platform
-export type Field = any;
-export type IndexPattern = any;
diff --git a/src/plugins/data/common/types.ts b/src/plugins/data/common/types.ts
index eae7c26e3ab3..ec8d8b006317 100644
--- a/src/plugins/data/common/types.ts
+++ b/src/plugins/data/common/types.ts
@@ -27,3 +27,4 @@ export * from './kbn_field_types/types';
 // will be replaces after Fieds / IndexPattern will be moved into new platform
 export type Field = any;
 export type IndexPattern = any;
+export type StaticIndexPattern = any;
diff --git a/src/plugins/data/public/autocomplete_provider/types.ts b/src/plugins/data/public/autocomplete_provider/types.ts
index 1f2d8f914dde..d838e54e9ead 100644
--- a/src/plugins/data/public/autocomplete_provider/types.ts
+++ b/src/plugins/data/public/autocomplete_provider/types.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { StaticIndexPattern, Field } from 'ui/index_patterns';
 import { AutocompleteProviderRegister } from '.';
+import { Field, StaticIndexPattern } from '..';
 
 export type AutocompletePublicPluginSetup = Pick<
   AutocompleteProviderRegister,
diff --git a/src/plugins/data/public/query/persisted_log/persisted_log.test.ts b/src/plugins/data/public/query/persisted_log/persisted_log.test.ts
index e0bc8f2c3525..87c1ec29c1ae 100644
--- a/src/plugins/data/public/query/persisted_log/persisted_log.test.ts
+++ b/src/plugins/data/public/query/persisted_log/persisted_log.test.ts
@@ -36,12 +36,6 @@ const createMockStorage = () => ({
   clear: jest.fn(),
 });
 
-jest.mock('ui/chrome', () => {
-  return {
-    getBasePath: () => `/some/base/path`,
-  };
-});
-
 const historyName = 'testHistory';
 const historyLimit = 10;
 const payload = [
diff --git a/src/plugins/data/public/suggestions_provider/types.ts b/src/plugins/data/public/suggestions_provider/types.ts
index eac380dde6a6..988b5fcd43fa 100644
--- a/src/plugins/data/public/suggestions_provider/types.ts
+++ b/src/plugins/data/public/suggestions_provider/types.ts
@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-// Should be import { Field } from './index_patterns';
-export type Field = any;
+import { Field } from '..';
 
 export type IGetSuggestions = (index: string, field: Field, query: string, boolFilter?: any) => any;
diff --git a/src/plugins/data/public/suggestions_provider/value_suggestions.test.ts b/src/plugins/data/public/suggestions_provider/value_suggestions.test.ts
index de2147cd7526..7dc8ff0fe133 100644
--- a/src/plugins/data/public/suggestions_provider/value_suggestions.test.ts
+++ b/src/plugins/data/public/suggestions_provider/value_suggestions.test.ts
@@ -19,7 +19,6 @@
 
 // TODO: remove when index patterns are moved here.
 jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
 
 import { stubIndexPattern, stubFields } from '../stubs';
 import { getSuggestionsProvider } from './value_suggestions';
diff --git a/src/plugins/data/public/suggestions_provider/value_suggestions.ts b/src/plugins/data/public/suggestions_provider/value_suggestions.ts
index 03eaa5d9594d..c769f64025b0 100644
--- a/src/plugins/data/public/suggestions_provider/value_suggestions.ts
+++ b/src/plugins/data/public/suggestions_provider/value_suggestions.ts
@@ -20,7 +20,8 @@
 import { memoize } from 'lodash';
 
 import { UiSettingsClientContract, HttpServiceBase } from 'src/core/public';
-import { IGetSuggestions, Field } from './types';
+import { IGetSuggestions } from './types';
+import { Field } from '..';
 
 export function getSuggestionsProvider(
   uiSettings: UiSettingsClientContract,