--- old/src/share/vm/gc/g1/g1RemSet.cpp	2017-03-21 16:20:21.018490667 -0400
+++ new/src/share/vm/gc/g1/g1RemSet.cpp	2017-03-21 16:20:19.814421107 -0400
@@ -506,27 +506,6 @@
   _into_cset_dirty_card_queue_set.clear_n_completed_buffers();
 }
 
-class G1ScrubRSClosure: public HeapRegionClosure {
-  G1CollectedHeap* _g1h;
-  G1CardLiveData* _live_data;
-public:
-  G1ScrubRSClosure(G1CardLiveData* live_data) :
-    _g1h(G1CollectedHeap::heap()),
-    _live_data(live_data) { }
-
-  bool doHeapRegion(HeapRegion* r) {
-    if (!r->is_continues_humongous()) {
-      r->rem_set()->scrub(_live_data);
-    }
-    return false;
-  }
-};
-
-void G1RemSet::scrub(uint worker_num, HeapRegionClaimer *hrclaimer) {
-  G1ScrubRSClosure scrub_cl(&_card_live_data);
-  _g1->heap_region_par_iterate(&scrub_cl, worker_num, hrclaimer);
-}
-
 G1UpdateRSOrPushRefOopClosure::G1UpdateRSOrPushRefOopClosure(G1CollectedHeap* g1h,
                                                              G1ParPushHeapRSClosure* push_ref_cl,
                                                              bool record_refs_into_cset,