[checkmk-commits] Further cleanups