diff --git a/client/lobby/RandomMapTab.h b/client/lobby/RandomMapTab.h
index a18f8acfc..fa62e151d 100644
--- a/client/lobby/RandomMapTab.h
+++ b/client/lobby/RandomMapTab.h
@@ -15,7 +15,6 @@
 #include "../../lib/GameConstants.h"
 #include "../../lib/rmg/CRmgTemplate.h"
 #include "../gui/InterfaceObjectConfigurable.h"
-#include "../lib/rmg/MapGenOptionsSaver.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 
@@ -29,7 +28,7 @@ class CLabelGroup;
 class CSlider;
 class CPicture;
 
-class RandomMapTab : public InterfaceObjectConfigurable, public MapGenOptionsSaver
+class RandomMapTab : public InterfaceObjectConfigurable
 {
 public:
 	RandomMapTab();
@@ -38,8 +37,8 @@ public:
 	void setMapGenOptions(std::shared_ptr<CMapGenOptions> opts);
 	void setTemplate(const CRmgTemplate *);
 
-	void saveOptions(const CMapGenOptions & options) override;
-	void loadOptions() override;
+	void saveOptions(const CMapGenOptions & options);
+	void loadOptions();
 	CMapGenOptions & obtainMapGenOptions() {return *mapGenOptions;}
 
 	CFunctionList<void(std::shared_ptr<CMapInfo>, std::shared_ptr<CMapGenOptions>)> mapInfoChanged;
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 3740de13b..566c2fdac 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -534,7 +534,6 @@ set(lib_HEADERS
 	rmg/RmgPath.h
 	rmg/CMapGenerator.h
 	rmg/CMapGenOptions.h
-	rmg/MapGenOptionsSaver.h
 	rmg/CRmgTemplate.h
 	rmg/CRmgTemplateStorage.h
 	rmg/CZonePlacer.h
diff --git a/mapeditor/windownewmap.cpp b/mapeditor/windownewmap.cpp
index 50fa71253..e81e4dfc7 100644
--- a/mapeditor/windownewmap.cpp
+++ b/mapeditor/windownewmap.cpp
@@ -169,6 +169,8 @@ bool WindowNewMap::loadUserSettings()
 		}
 		ret = true;
 	}
+
+	return ret;
 }
 
 void WindowNewMap::saveUserSettings()
@@ -185,17 +187,6 @@ void WindowNewMap::saveUserSettings()
 	s.setValue(newMapGenerateRandom, ui->randomMapCheck->isChecked());
 }
 
-void WindowNewMap::saveOptions(const CMapGenOptions & options)
-{
-	// TODO
-}
-
-void WindowNewMap::loadOptions()
-{
-	mapGenOptions = CMapGenOptions();
-	// TODO
-}
-
 void WindowNewMap::on_cancelButton_clicked()
 {
 	saveUserSettings();
diff --git a/mapeditor/windownewmap.h b/mapeditor/windownewmap.h
index fd1d52db3..1fadd28a2 100644
--- a/mapeditor/windownewmap.h
+++ b/mapeditor/windownewmap.h
@@ -12,14 +12,13 @@
 
 #include <QDialog>
 #include "../lib/rmg/CMapGenOptions.h"
-#include "../lib/rmg/MapGenOptionsSaver.h"
 
 namespace Ui
 {
 	class WindowNewMap;
 }
 
-class WindowNewMap : public QDialog, public MapGenOptionsSaver
+class WindowNewMap : public QDialog
 {
 	Q_OBJECT
 
@@ -113,9 +112,6 @@ private:
 	bool loadUserSettings();
 	void saveUserSettings();
 
-	void saveOptions(const CMapGenOptions & options) override;
-	void loadOptions() override;
-
 private:
 	Ui::WindowNewMap *ui;