[checkmk-commits] Cleaned up discovery code