diff --git a/source/java/org/alfresco/rest/api/search/context/facetsresponse/GenericBucket.java b/source/java/org/alfresco/rest/api/search/context/facetsresponse/GenericBucket.java
deleted file mode 100644
index e0806b11af..0000000000
--- a/source/java/org/alfresco/rest/api/search/context/facetsresponse/GenericBucket.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.rest.api.search.context.facetsresponse;
-
-import java.util.List;
-
-/**
- * A Generic Bucket response covering range, interval, pivot etc.
- */
-public class GenericBucket
-{
- private final String label;
- private final String filterQuery;
- private final Object display;
- private final List metrics;
-
- public GenericBucket(String label, String filterQuery, Object display, List metrics)
- {
- this.label = label;
- this.filterQuery = filterQuery;
- this.display = display;
- this.metrics = metrics;
- }
-
- public String getFilterQuery()
- {
- return filterQuery;
- }
-
- public Object getDisplay()
- {
- return display;
- }
-
- public String getLabel()
- {
- return label;
- }
-
- public List getMetrics()
- {
- return metrics;
- }
-
-
-}
diff --git a/source/java/org/alfresco/rest/api/search/context/facetsresponse/GenericFacetResponse.java b/source/java/org/alfresco/rest/api/search/context/facetsresponse/GenericFacetResponse.java
deleted file mode 100644
index caa81aef3b..0000000000
--- a/source/java/org/alfresco/rest/api/search/context/facetsresponse/GenericFacetResponse.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.rest.api.search.context.facetsresponse;
-
-import java.util.List;
-
-/**
- * A Generic facet response covering range, interval, pivot etc.
- */
-public class GenericFacetResponse
-{
- public static enum FACET_TYPE {range, interval};
- private final FACET_TYPE type;
- private final String label;
- private final List buckets;
-
- public GenericFacetResponse(FACET_TYPE type, String label, List buckets)
- {
- this.type = type;
- this.label = label;
- this.buckets = buckets;
- }
-
- public String getLabel()
- {
- return label;
- }
-
- public List getBuckets()
- {
- return buckets;
- }
-
- public FACET_TYPE getType()
- {
- return type;
- }
-
-}
diff --git a/source/java/org/alfresco/rest/api/search/context/facetsresponse/Metric.java b/source/java/org/alfresco/rest/api/search/context/facetsresponse/Metric.java
deleted file mode 100644
index c864d9fd33..0000000000
--- a/source/java/org/alfresco/rest/api/search/context/facetsresponse/Metric.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.rest.api.search.context.facetsresponse;
-
-import java.util.Map;
-import java.util.Date;
-/**
- * Metrics returned from Solr
- */
-public interface Metric
-{
- public static enum METRIC_TYPE {count};
-
- METRIC_TYPE getType();
- Map getValue();
-}
diff --git a/source/java/org/alfresco/rest/api/search/context/facetsresponse/MetricCount.java b/source/java/org/alfresco/rest/api/search/context/facetsresponse/MetricCount.java
deleted file mode 100644
index b9b14a2864..0000000000
--- a/source/java/org/alfresco/rest/api/search/context/facetsresponse/MetricCount.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.rest.api.search.context.facetsresponse;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A count metric
- */
-public class MetricCount implements Metric
-{
- private final Map value = new HashMap<>(1);
-
- public MetricCount(Integer count)
- {
- value.put("count", count);
- }
-
- @Override
- public METRIC_TYPE getType()
- {
- return METRIC_TYPE.count;
- }
-
- @Override
- public Map getValue()
- {
- return value;
- }
-}