diff --git a/README.md b/README.md
index b7691383..b2d5c08f 100644
--- a/README.md
+++ b/README.md
@@ -151,7 +151,15 @@ bazel run --config=asan --compilation_mode=opt //flatland/cli:flatland.cli --  $
 #### Clang Tidy
 
 ```shell
-bazel build --config=clang-tidy //flatland/core/...
+bazel build --config=clang-tidy //core:object
+```
+
+or
+
+```shell
+bazel build //core:object \
+  --aspects @bazel_clang_tidy//clang_tidy:clang_tidy.bzl%clang_tidy_aspect \
+  --output_groups=report
 ```
 
 ### Building with Windows
diff --git a/devertexwahn/.bazelrc b/devertexwahn/.bazelrc
index 5ea03af0..a0044b22 100644
--- a/devertexwahn/.bazelrc
+++ b/devertexwahn/.bazelrc
@@ -163,8 +163,6 @@ build:asan --linkopt -fsanitize=address
 # clang-tidy
 build:clang-tidy --aspects @bazel_clang_tidy//clang_tidy:clang_tidy.bzl%clang_tidy_aspect
 build:clang-tidy --output_groups=report
-build:clang-tidy --@bazel_clang_tidy//:clang_tidy_config=//:clang_tidy_config2
-build:clang-tidy --cxxopt=-std=c++17
 
 # Optimized build
 build:optimized build --copt=-O3
diff --git a/devertexwahn/WORKSPACE.bzlmod b/devertexwahn/WORKSPACE.bzlmod
deleted file mode 100644
index aa80b6d0..00000000
--- a/devertexwahn/WORKSPACE.bzlmod
+++ /dev/null
@@ -1,13 +0,0 @@
-"""
-    SPDX-FileCopyrightText: Copyright 2022-2024 Julian Amann <dev@vertexwahn.de>
-    SPDX-License-Identifier: Apache-2.0
-"""
-
-workspace(name = "de_vertexwahn")
-
-load("//okapi/third_party:okapi_deps.bzl", "okapi_deps")
-
-#-------------------------------------------------------------------------------------
-
-okapi_deps()
-
diff --git a/devertexwahn/okapi/third_party/okapi_deps.bzl b/devertexwahn/okapi/third_party/okapi_deps.bzl
deleted file mode 100644
index 8b3c6042..00000000
--- a/devertexwahn/okapi/third_party/okapi_deps.bzl
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-    SPDX-FileCopyrightText: Copyright 2022-2024 Julian Amann <dev@vertexwahn.de>
-    SPDX-License-Identifier: Apache-2.0
-"""
-
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-
-def okapi_deps():
-    """Fetch external dependencies for Okapi."""
-
-    #-------------------------------------------------------------------------------------
-    # bazel_clang_tidy
-    #-------------------------------------------------------------------------------------
-
-    maybe(
-        native.local_repository,
-        name = "bazel_clang_tidy",
-        path = "../third_party/bazel_clang_tidy-4884c32e09c1ea9ac96b3f08c3004f3ac4c3fe39",
-    )
-