diff --git a/development_icon_get.py b/development_icon_get.py
index 6f052b055e36c908d575e22b98acb57d400c83ef..f5267e254f1fae2c546391aa6f17265fcf227ac7 100644
--- a/development_icon_get.py
+++ b/development_icon_get.py
@@ -248,8 +248,8 @@ def unregister():
         pass
     if __name__ == "__main__":
         # unregistering is only done automatically when run as add-on
-        bpy.types.unregister(OBJECT_PT_icons)
-        bpy.types.unregister(CONSOLE_HT_icons)
+        bpy.utils.unregister_class(OBJECT_PT_icons)
+        bpy.utils.unregister_class(CONSOLE_HT_icons)
 
     bpy.utils.unregister_module(__name__)
 
diff --git a/rigify/metarig_menu.py b/rigify/metarig_menu.py
index 828708d0600622f31a46905d13c8ca92d14969bd..56b82370a09ff5e2866954f1ed420569f2f6ce4e 100644
--- a/rigify/metarig_menu.py
+++ b/rigify/metarig_menu.py
@@ -54,6 +54,5 @@ def register():
 def unregister():
     bpy.utils.unregister_class(AddHuman)
 
-    #bpy.types.unregister(AddHuman)
     bpy.types.INFO_MT_armature_add.remove(menu_func)
 
diff --git a/rigify/ui.py b/rigify/ui.py
index 09257f596e0dba087ce6ce3f17d1ff804a0e8e69..4c3353bb30a73c81ecb8f3615f973daa555f686d 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -242,7 +242,7 @@ def register():
 
 
 def unregister():
-    bpy.types.unregister(DATA_PT_rigify_buttons)
-    bpy.types.unregister(BONE_PT_rigify_buttons)
-    bpy.types.unregister(Generate)
-    bpy.types.unregister(Sample)
+    bpy.utils.unregister_class(DATA_PT_rigify_buttons)
+    bpy.utils.unregister_class(BONE_PT_rigify_buttons)
+    bpy.utils.unregister_class(Generate)
+    bpy.utils.unregister_class(Sample)
diff --git a/space_view3d_copy_attributes.py b/space_view3d_copy_attributes.py
index 4c1babb10144cb61a06d52715cd8af4a47e1cce0..8b622c3d9ea78e6323c5d54345286c8ce167f576 100644
--- a/space_view3d_copy_attributes.py
+++ b/space_view3d_copy_attributes.py
@@ -765,7 +765,7 @@ def unregister():
             item.idname = 'pose.copy'
             break
     for menu in _layer_menus:
-        bpy.types.unregister(menu)
+        bpy.utils.unregister_class(menu)
     bpy.types.DATA_PT_texface.remove(_add_tface_buttons)
     km = bpy.context.window_manager.keyconfigs.active.keymaps['Mesh']
     for kmi in km.items: