diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java
index c862a9fc03e..e500ab76db3 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java
@@ -43,7 +43,7 @@ import org.apache.solr.schema.TrieField;
  * it all with bytes, to not change any wire serialization etc.
  */
 class GroupConverter {
-
+  
   static Collection<SearchGroup<BytesRef>> fromMutable(SchemaField field, Collection<SearchGroup<MutableValue>> values) {
     if (values == null) {
       return null;
@@ -64,7 +64,7 @@ class GroupConverter {
     }
     return result;
   }
-
+  
   static Collection<SearchGroup<MutableValue>> toMutable(SchemaField field, Collection<SearchGroup<BytesRef>> values) {
     FieldType fieldType = field.getType();
     List<SearchGroup<MutableValue>> result = new ArrayList<>(values.size());
@@ -132,17 +132,17 @@ class GroupConverter {
     }
     return result;
   }
-
+  
   static TopGroups<BytesRef> fromMutable(SchemaField field, TopGroups<MutableValue> values) {
     if (values == null) {
       return null;
     }
-
+    
     FieldType fieldType = field.getType();
-
+    
     @SuppressWarnings("unchecked")
     GroupDocs<BytesRef> groupDocs[] = new GroupDocs[values.groups.length];
-
+    
     for (int i = 0; i < values.groups.length; i++) {
       GroupDocs<MutableValue> original = values.groups[i];
       final BytesRef groupValue;
@@ -155,7 +155,7 @@ class GroupConverter {
       }
       groupDocs[i] = new GroupDocs<BytesRef>(original.score, original.maxScore, original.totalHits, original.scoreDocs, groupValue, original.groupSortValues);
     }
-
+    
     return new TopGroups<BytesRef>(values.groupSort, values.withinGroupSort, values.totalHitCount, values.totalGroupedHitCount, groupDocs, values.maxScore);
   }
 }
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema.xml b/solr/core/src/test-files/solr/collection1/conf/schema.xml
index 6a66cbd445f..f9628bc298e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema.xml
@@ -577,8 +577,6 @@
    -->
    <dynamicField name="*_i"  type="int"    indexed="true"  stored="true"/>
    <dynamicField name="*_i1"  type="int"    indexed="true" stored="true" multiValued="false" sortMissingLast="true"/>
-   <dynamicField name="*_idv"  type="int"    indexed="true"  stored="true" docValues="true" multiValued="false" />
-
                  
    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true"/>
    <dynamicField name="*_s1"  type="string"  indexed="true"  stored="true" multiValued="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema12.xml b/solr/core/src/test-files/solr/collection1/conf/schema12.xml
index df4da0b8a9a..5481bbc9883 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema12.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema12.xml
@@ -524,7 +524,6 @@
 
    <dynamicField name="*_i"  type="int"    indexed="true"  stored="true"/>
    <dynamicField name="*_is"  type="int"    indexed="true"  stored="true" multiValued="true"/>
-   <dynamicField name="*_idv"  type="int"    indexed="true"  stored="true" docValues="true" multiValued="false" />
    <dynamicField name="*_s1"  type="string"  indexed="true" stored="true" multiValued="false"/>
    <!-- :TODO: why are these identical?!?!?! -->
    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" multiValued="true"/>