diff --git a/flow/flow.cpp b/flow/flow.cpp
index a80223248..e80981e02 100644
--- a/flow/flow.cpp
+++ b/flow/flow.cpp
@@ -60,6 +60,8 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp>
 #include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp>
diff --git a/flow/flow_tag.hpp b/flow/flow_tag.hpp
index 388166720..7d189257e 100644
--- a/flow/flow_tag.hpp
+++ b/flow/flow_tag.hpp
@@ -42,6 +42,8 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp>
 
 //#include <opm/material/fluidsystems/BlackOilFluidSystemSimple.hpp>
 //#include <opm/material/fluidsystems/BlackOilFluidSystemSimple.hpp>
diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index 19c0555bb..0cf951aa3 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -44,8 +44,6 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp>
 #include <opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp>
 #include <dune/common/parallel/mpitraits.hh>
 
@@ -659,18 +657,6 @@ std::size_t packSize(const Group& data,
            packSize(data.productionProperties(), comm);
 }
 
-std::size_t packSize(const WList& data,
-                     Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.wellList(), comm);
-}
-
-std::size_t packSize(const WListManager& data,
-                     Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.lists(), comm);
-}
-
 std::size_t packSize(const GuideRateModel& data,
                      Dune::MPIHelper::MPICommunicator comm)
 {
@@ -1472,20 +1458,6 @@ void pack(const Group& data,
     pack(data.productionProperties(), buffer, position, comm);
 }
 
-void pack(const WList& data,
-          std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.wellList(), buffer, position, comm);
-}
-
-void pack(const WListManager& data,
-          std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.lists(), buffer, position, comm);
-}
-
 void pack(const GuideRateModel& data,
           std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
@@ -2535,24 +2507,6 @@ void unpack(Group& data,
                  injection, production);
 }
 
-void unpack(WList& data,
-            std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    WList::storage ddata;
-    unpack(ddata, buffer, position, comm);
-    data = WList(ddata);
-}
-
-void unpack(WListManager& data,
-            std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    std::map<std::string,WList> lists;
-    unpack(lists, buffer, position, comm);
-    data = WListManager(lists);
-}
-
 void unpack(GuideRateModel& data,
             std::vector<char>& buffer, int& position,
             Dune::MPIHelper::MPICommunicator comm)
@@ -2915,6 +2869,7 @@ INSTANTIATE_PACK(std::map<std::string,std::map<std::pair<int,int>,int>>)
 INSTANTIATE_PACK(std::map<UDQVarType,std::size_t>)
 INSTANTIATE_PACK(std::unordered_map<std::string,size_t>)
 INSTANTIATE_PACK(std::unordered_map<std::string,std::string>)
+INSTANTIATE_PACK(std::unordered_set<std::string>)
 INSTANTIATE_PACK(std::pair<bool,double>)
 INSTANTIATE_PACK(std::pair<bool,std::size_t>)
 INSTANTIATE_PACK(DynamicState<int>)
@@ -2923,7 +2878,6 @@ INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSale>>)
 INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSump>>)
 INSTANTIATE_PACK(DynamicState<std::shared_ptr<GuideRateConfig>>)
 INSTANTIATE_PACK(DynamicState<Well::ProducerCMode>)
-INSTANTIATE_PACK(DynamicState<std::shared_ptr<WListManager>>)
 INSTANTIATE_PACK(DynamicVector<Deck>)
 
 #undef INSTANTIATE_PACK
diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp
index 581e72f42..2a212234f 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -74,8 +74,6 @@ class WellFoamProperties;
 class WellPolymerProperties;
 class WellSegments;
 class WellTracerProperties;
-class WList;
-class WListManager;
 
 namespace Mpi
 {
@@ -450,8 +448,6 @@ ADD_PACK_PROTOTYPES(WellFoamProperties)
 ADD_PACK_PROTOTYPES(WellPolymerProperties)
 ADD_PACK_PROTOTYPES(WellSegments)
 ADD_PACK_PROTOTYPES(WellTracerProperties)
-ADD_PACK_PROTOTYPES(WList)
-ADD_PACK_PROTOTYPES(WListManager)
 
 } // end namespace Mpi
 
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp
index 05fbe855e..978f9e2ee 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelRestart.cpp
@@ -1643,7 +1643,7 @@ BOOST_AUTO_TEST_CASE(WList)
 {
 #ifdef HAVE_MPI
     Opm::WList val1({"test1", "test2", "test3"});
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(WList)
 #endif
 }
@@ -1655,7 +1655,7 @@ BOOST_AUTO_TEST_CASE(WListManager)
     Opm::WList wl({"test1", "test2", "test3"});
     std::map<std::string,Opm::WList> data{{"test", wl}, {"test2", wl}};
     Opm::WListManager val1(data);
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(WListManager)
 #endif
 }