--- a/src/hotspot/share/gc/z/zNMethodTable.hpp	Wed Feb 20 12:04:12 2019 +0100
+++ b/src/hotspot/share/gc/z/zNMethodTable.hpp	Thu Feb 21 14:24:44 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,17 +24,12 @@
 #ifndef SHARE_GC_Z_ZNMETHODTABLE_HPP
 #define SHARE_GC_Z_ZNMETHODTABLE_HPP
 
-#include "gc/z/zArray.hpp"
-#include "gc/z/zGlobals.hpp"
-#include "gc/z/zLock.hpp"
-#include "gc/z/zNMethodTableEntry.hpp"
 #include "gc/z/zNMethodTableIteration.hpp"
 #include "memory/allocation.hpp"
 
 class nmethod;
 class NMethodClosure;
-class ZNMethodData;
-class ZNMethodDataOops;
+class ZNMethodTableEntry;
 class ZWorkers;
 
 class ZNMethodTable : public AllStatic {
@@ -48,36 +43,23 @@
   static ZNMethodTableEntry* create(size_t size);
   static void destroy(ZNMethodTableEntry* table);
 
-  static void attach_gc_data(nmethod* nm);
-  static void detach_gc_data(nmethod* nm);
-
   static size_t first_index(const nmethod* nm, size_t size);
   static size_t next_index(size_t prev_index, size_t size);
 
-  static void wait_until_iteration_done();
-
   static bool register_entry(ZNMethodTableEntry* table, size_t size, nmethod* nm);
   static void unregister_entry(ZNMethodTableEntry* table, size_t size, nmethod* nm);
 
   static void rebuild(size_t new_size);
   static void rebuild_if_needed();
 
-  static void log_register(const nmethod* nm);
-  static void log_unregister(const nmethod* nm);
-
 public:
   static size_t registered_nmethods();
   static size_t unregistered_nmethods();
 
   static void register_nmethod(nmethod* nm);
   static void unregister_nmethod(nmethod* nm);
-  static void disarm_nmethod(nmethod* nm);
 
-  static ZReentrantLock* lock_for_nmethod(nmethod* nm);
-
-  static void oops_do(OopClosure* cl);
-
-  static void oops_do(nmethod* nm, OopClosure* cl);
+  static void wait_until_iteration_done();
 
   static void nmethods_do_begin();
   static void nmethods_do_end();