diff --git a/.clang-format b/.clang-format
index 0d59087..1b641b2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -37,12 +37,6 @@ AlwaysBreakAfterReturnType: AllDefinitions
 #  - H5_ATTR_FALLTHROUGH
 ForEachMacros: ['ALL_MEMBERS', 'UNIQUE_MEMBERS']
 IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        3
-    SortPriority:    0
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        4
-    SortPriority:    0
   - Regex:           '.*'
     Priority:        0
     SortPriority:    0
@@ -58,38 +52,10 @@ IndentCaseLabels: true
 IndentGotoLabels: false
 #llvm11: IndentExternBlock: AfterExternBlock
 #llvm11: InsertTrailingCommas: None
-MacroBlockBegin: "^BEGIN_FUNC"
-MacroBlockEnd: "^END_FUNC"
 ObjCBlockIndentWidth: 4
 #llvm11: ObjCBreakBeforeNestedBlockParam: true
 ReflowComments:  true
 SortIncludes:    false
-StatementMacros:
-  - CATCH
-  - END_MEMBERS
-  - FUNC_ENTER_API
-  - FUNC_ENTER_NOAPI
-  - FUNC_ENTER_NOAPI_NOERR
-  - FUNC_ENTER_NOAPI_NOINIT
-  - FUNC_ENTER_NOAPI_NOINIT_NOERR
-  - FUNC_ENTER_PACKAGE
-  - FUNC_LEAVE_API
-  - FUNC_LEAVE_NOAPI
-  - FUNC_LEAVE_NOAPI_NOFS
-  - H5E_END_TRY
-  - H5E_PRINTF
-  - H5E_THROW
-  - H5_BEGIN_TAG
-  - H5_END_TAG
-  - H5_GCC_DIAG_OFF
-  - H5_GCC_DIAG_ON
-  - H5_LEAVE
-  - HGOTO_DONE
-  - HMPI_DONE_ERROR
-  - HMPI_ERROR
-  - HMPI_GOTO_ERROR
-  - HSYS_DONE_ERROR
-  - HSYS_GOTO_ERROR
 #llvm10: TypenameMacros:
 #llvm10:   - STACK_OF
 #llvm10:   - LIST