diff --git a/.claude/settings.json b/.claude/settings.json
index 38e9482d..08653ac0 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -67,7 +67,6 @@
       "Bash(uniq:*)",
       "Bash(wc:*)",
       "Bash(which:*)",
-      "Edit(*)",
       "Edit(./**)",
       "Glob(*)",
       "Grep(*)",
@@ -89,11 +88,23 @@
   },
   "enabledPlugins": {
     "rust-analyzer-lsp@claude-plugins-official": true,
-    "code-review@claude-plugins-official": true
+    "code-review@claude-plugins-official": true,
+    "typescript-lsp@claude-plugins-official": true,
+    "jdtls-lsp@claude-plugins-official": true,
+    "clangd-lsp@claude-plugins-official": true,
+    "code-simplifier@claude-plugins-official": true,
+    "pyright-lsp@claude-plugins-official": true,
+    "claude-code-setup@claude-plugins-official": true,
+    "playground@claude-plugins-official": true,
+    "pr-review-toolkit@claude-plugins-official": true
   },
-  "skipDangerousModePermissionPrompt": true,
   "spinnerVerbs": {
     "mode": "replace",
-    "verbs": ["Thinking", "Processing", "Working"]
-  }
+    "verbs": [
+      "Thinking",
+      "Processing",
+      "Working"
+    ]
+  },
+  "skipDangerousModePermissionPrompt": true
 }
diff --git a/.pmd-ruleset.xml b/.pmd-ruleset.xml
index 9acdf55a..17a1af78 100644
--- a/.pmd-ruleset.xml
+++ b/.pmd-ruleset.xml
@@ -163,7 +163,6 @@
     <rule ref="category/java/design.xml/SwitchDensity" />
     <rule ref="category/java/design.xml/TooManyFields" />
     <rule ref="category/java/design.xml/UselessOverridingMethod" />
-    <rule ref="category/java/design.xml/UseObjectForClearerAPI" />
     <rule ref="category/java/design.xml/UseUtilityClass" />
 
     <!-- design rules that seem to be broken.
@@ -267,6 +266,7 @@
     <rule ref="category/java/errorprone.xml/NonSerializableClass" />
     <rule ref="category/java/errorprone.xml/NonStaticInitializer" />
     <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode" />
+    <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashCodeOnComparable" />
     <rule ref="category/java/errorprone.xml/ProperCloneImplementation" />
     <rule ref="category/java/errorprone.xml/ProperLogger" />
     <rule ref="category/java/errorprone.xml/ReplaceJavaUtilCalendar" />
@@ -306,7 +306,6 @@
     <rule ref="category/java/errorprone.xml/CompareObjectsWithEquals" />
     <rule ref="category/java/errorprone.xml/DoNotTerminateVM" />
     <rule ref="category/java/errorprone.xml/NullAssignment" />
-    <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashCodeOnComparable" />
     <rule ref="category/java/errorprone.xml/ReturnEmptyCollectionRatherThanNull" />
     <rule ref="category/java/errorprone.xml/TestClassWithoutTestCases" />
     <rule ref="category/java/errorprone.xml/UseProperClassLoader" />