diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b177d4ef29..bf4d6285ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,19 +93,19 @@ Coverity:
   tags:
     - docker
     - linux
-  image: ubuntu:20.04
+  image: ubuntu:22.04
   stage: build
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
   cache:
-    key: Coverity.ubuntu_20.04.v1
+    key: Coverity.ubuntu_22.04.v1
     paths:
     - apt-cache/
     - ccache/
   variables:
     CCACHE_SIZE: 2G
-    CC: clang-11
-    CXX: clang++-11
+    CC: clang-12
+    CXX: clang++-12
     CMAKE_BUILD_TYPE: Debug
     CMAKE_CXX_FLAGS_DEBUG: -O0
   before_script:
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 58277522b3..4417a04317 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -11,7 +11,7 @@ print_help() {
 declare -rA GROUPED_DEPS=(
   [gcc]="binutils gcc build-essential cmake ccache curl unzip git pkg-config mold"
   [clang]="binutils clang make cmake ccache curl unzip git pkg-config mold"
-  [coverity]="binutils clang-11 make cmake ccache curl unzip git pkg-config"
+  [coverity]="binutils clang-12 make cmake ccache curl unzip git pkg-config"
   [gcc_preprocess]="
     binutils
     build-essential
diff --git a/apps/openmw/mwrender/ripples.cpp b/apps/openmw/mwrender/ripples.cpp
index 9d62184904..191ff0e714 100644
--- a/apps/openmw/mwrender/ripples.cpp
+++ b/apps/openmw/mwrender/ripples.cpp
@@ -184,19 +184,6 @@ namespace MWRender
         // FIXME: when we skip frames we need to preserve positions. this doesn't work now
         size_t ticks = 1;
 
-        // float referenceTime = state.getFrameStamp()->getReferenceTime();
-        // float frameTime = (mLastFrameTime != 0.0) ? referenceTime - mLastFrameTime : 0.0;
-        // frameTime = std::min(frameTime, 0.5f);
-
-        // mLastFrameTime = referenceTime;
-
-        // constexpr float rate = 60.0;
-        // constexpr float waveStep = 1.0 / rate;
-
-        // mRemainingWaveTime += frameTime;
-        // ticks = mRemainingWaveTime / waveStep;
-        // mRemainingWaveTime -= ticks * waveStep;
-
         // PASS: Blot in all ripple spawners
         mProgramBlobber->apply(state);
         state.apply(frameState.mStateset);
diff --git a/apps/openmw/mwrender/ripples.hpp b/apps/openmw/mwrender/ripples.hpp
index 8e7f9f0c0a..0d5b055eb5 100644
--- a/apps/openmw/mwrender/ripples.hpp
+++ b/apps/openmw/mwrender/ripples.hpp
@@ -79,10 +79,6 @@ namespace MWRender
 
         bool mPaused = false;
         bool mUseCompute = false;
-
-        // Read/written in draw thread only
-        mutable float mRemainingWaveTime = 0;
-        mutable double mLastFrameTime = 0;
     };
 
     class Ripples : public osg::Camera