diff --git a/opm/parser/eclipse/EclipseState/EclipseState.cpp b/opm/parser/eclipse/EclipseState/EclipseState.cpp
index 6f7c1f270..ea941b859 100644
--- a/opm/parser/eclipse/EclipseState/EclipseState.cpp
+++ b/opm/parser/eclipse/EclipseState/EclipseState.cpp
@@ -361,24 +361,13 @@ namespace Opm {
     void EclipseState::initMULTREGT(DeckConstPtr deck, ParserLogPtr /*parserLog*/) {
         EclipseGridConstPtr grid = getEclipseGrid();
 
-        std::vector<Opm::DeckKeywordConstPtr> keywords;
-        {
-            std::shared_ptr<Opm::GRIDSection> gridSection(new Opm::GRIDSection(deck) );
-            for (size_t index=0; index < gridSection->count("MULTREGT"); index++) {
-                DeckKeywordConstPtr multregtKeyword = gridSection->getKeyword("MULTREGT" , index);
-                keywords.push_back( multregtKeyword );
-            }
-        }
+        std::vector<Opm::DeckKeywordConstPtr> multregtKeywords;
+        if (deck->hasKeyword("MULTREGT"))
+            multregtKeywords = deck->getKeywordList("MULTREGT");
 
-
-        if (Section::hasEDIT(deck)) {
-            std::shared_ptr<Opm::EDITSection> editSection(new Opm::EDITSection(deck) );
-            for (size_t index=0; index < editSection->count("MULTREGT"); index++) {
-                DeckKeywordConstPtr multregtKeyword = editSection->getKeyword("MULTREGT" , index);
-                keywords.push_back( multregtKeyword );
-            }
-        }
-        std::shared_ptr<MULTREGTScanner> scanner = std::make_shared<MULTREGTScanner>( m_intGridProperties, keywords);
+        std::shared_ptr<MULTREGTScanner> scanner =
+            std::make_shared<MULTREGTScanner>(m_intGridProperties,
+                                              multregtKeywords);
 
         m_transMult->setMultregtScanner( scanner );
     }
diff --git a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp b/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
index 380c91454..47524e02b 100644
--- a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
@@ -125,9 +125,8 @@ namespace Opm {
     MULTREGTScanner::MULTREGTScanner(std::shared_ptr<GridProperties<int> > cellRegionNumbers, const std::vector<DeckKeywordConstPtr>& keywords ) :
         m_cellRegionNumbers(cellRegionNumbers) {
 
-        for (int indx = 0; indx < keywords.size(); indx++){
-            addKeyword(keywords[indx]);
-        }
+        for (size_t idx = 0; idx < keywords.size(); idx++)
+            addKeyword(keywords[idx]);
 
         MULTREGTSearchMap searchPairs;
         for (std::vector<MULTREGTRecord>::const_iterator record = m_records.begin(); record != m_records.end(); ++record) {
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp
index 6adfd38c4..306d02491 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp
@@ -202,44 +202,6 @@ BOOST_AUTO_TEST_CASE(NotSupported) {
 
 }
 
-
-static Opm::DeckPtr createSimpleMULTREGTDeck() {
-    const char *deckData =
-        "RUNSPEC\n"
-        "\n"
-        "DIMENS\n"
-        "2 2 2 /\n"
-        "GRID\n"
-        "FLUXNUM\n"
-        "1 2\n"
-        "1 2\n"
-        "3 4\n"
-        "3 4\n"
-        "/\n"
-        "MULTNUM\n"
-        "1 2\n"
-        "1 2\n"
-        "3 4\n"
-        "3 4\n"
-        "/\n"
-        "MULTREGT\n"
-        "1  2   0.50   X   ALL    M / \n"
-        "/\n"
-        "MULTREGT\n"
-        "2  1   1.50   X   ALL    M / \n"
-        "/\n"
-        "MULTREGT\n"
-        "2  1   2.50   XYZ   NNC      M / \n"
-        "2  1   3.50   XYZ   NONNC    M / \n"
-        "/\n"
-        "EDIT\n"
-        "\n";
-
-    Opm::ParserPtr parser(new Opm::Parser());
-    return parser->parseString(deckData) ;
-}
-
-
 static Opm::DeckPtr createCopyMULTNUMDeck() {
     const char *deckData =
         "RUNSPEC\n"