diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index c019e522..ef4d3bb5 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1312,6 +1312,7 @@ modules:
   #   buildsystem: simple
   #   build-commands:
   #     - cp -rn files/* /app
+  #     - COPY THE CONFIGS? MAYBE NOT
   #   sources:
   #   - type: archive
   #     url: 
diff --git a/rd-submodules/mame/floppy.patch b/rd-submodules/mame/floppy.patch
deleted file mode 100644
index 1754f616..00000000
--- a/rd-submodules/mame/floppy.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp
-index 3c00336d..cda94d92 100644
---- a/src/devices/imagedev/floppy.cpp
-+++ b/src/devices/imagedev/floppy.cpp
-@@ -1707,9 +1707,10 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector<
- 		{
- 			idx = m_spin_playback_sample;
- 			sampleend = m_sample[idx].data.size();
--			out = m_sample[idx].data[m_spin_samplepos++];
--
--			if (m_spin_samplepos >= sampleend)
-+			m_spin_samplepos++;
-+			if (m_spin_samplepos < sampleend)
-+				out = m_sample[idx].data[m_spin_samplepos];
-+			else
- 			{
- 				// Motor sample has completed
- 				switch (m_spin_playback_sample)
-@@ -1763,7 +1764,8 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector<
- 			idx = m_step_base + m_seek_playback_sample;
- 			sampleend = m_sample[idx].data.size();
- 			// Mix it into the stream value
--			out += m_sample[idx].data[(int)m_seek_samplepos];
-+			if (m_seek_samplepos < sampleend)
-+				out += m_sample[idx].data[(int)m_seek_samplepos];
- 			// By adding different values than 1, we can change the playback speed
- 			// This will be used to adjust the seek sound
- 			m_seek_samplepos += m_seek_pitch;
-@@ -1781,8 +1783,10 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector<
- 				sampleend = m_sample[idx].data.size();
- 
- 				// Mix it into the stream value
--				out += m_sample[idx].data[m_step_samplepos++];
--				if (m_step_samplepos >= sampleend)
-+				m_step_samplepos++;
-+				if (m_step_samplepos < sampleend)
-+					out += m_sample[idx].data[m_step_samplepos];
-+				else
- 				{
- 					// Step sample done
- 					m_step_samplepos = 0;
\ No newline at end of file
diff --git a/rd-submodules/mame/mame.ini b/rd-submodules/mame/mame.ini
deleted file mode 100644
index 0164486f..00000000
--- a/rd-submodules/mame/mame.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CORE SEARCH PATH OPTIONS
-#
-homepath                  $HOME/.mame
-rompath                   /app/share/mame/roms
-hashpath                  /app/share/mame/hash
-samplepath                /app/share/mame/samples
-artpath                   /app/share/mame/artwork
-ctrlrpath                 /app/share/mame/ctrlr
-inipath                   $HOME/.mame;/app/share/mame/ini
-fontpath                  /app/bin/
-cheatpath                 /app/share/mame/cheat
-crosshairpath             /app/share/mame/crosshair
-pluginspath               /app/share/mame/plugins
-languagepath              /app/share/mame/language
-swpath                    /app/share/mame/software
-
-#
-# CORE OUTPUT DIRECTORY OPTIONS
-#
-cfg_directory             $HOME/.mame/cfg
-nvram_directory           $HOME/.mame/nvram
-input_directory           $HOME/.mame/inp
-state_directory           $HOME/.mame/sta
-snapshot_directory        $HOME/.mame/snap
-diff_directory            $HOME/.mame/diff
-comment_directory         $HOME/.mame/comments
-share_directory           $HOME/.mame/share
-
-#
-# OSD VIDEO OPTIONS
-#
-video                     opengl
\ No newline at end of file
diff --git a/rd-submodules/mame/sound.patch b/rd-submodules/mame/sound.patch
deleted file mode 100644
index 84b51ff6..00000000
--- a/rd-submodules/mame/sound.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp
-index a0293063..c4989abb 100644
---- a/src/emu/sound.cpp
-+++ b/src/emu/sound.cpp
-@@ -761,6 +761,9 @@ read_stream_view sound_stream::update_view(attotime start, attotime end, u32 out
- 	}
- 	g_profiler.stop();
- 
-+	if (!m_output_view[outputnum].valid())
-+		m_output_view[outputnum] = empty_view(start, end);
-+
- 	// return the requested view
- 	return read_stream_view(m_output_view[outputnum], start);
- }
-diff --git a/src/emu/sound.h b/src/emu/sound.h
-index 15f6a574..bfa45c45 100644
---- a/src/emu/sound.h
-+++ b/src/emu/sound.h
-@@ -284,6 +284,9 @@ public:
- 		return *this;
- 	}
- 
-+	// check basic constraints
-+	bool valid() const { return m_buffer != nullptr; }
-+
- 	// return the local gain
- 	sample_t gain() const { return m_gain; }
- 
\ No newline at end of file
diff --git a/rd-submodules/mame/ym3802.patch b/rd-submodules/mame/ym3802.patch
deleted file mode 100644
index a48925ab..00000000
--- a/rd-submodules/mame/ym3802.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/devices/machine/ym3802.cpp b/src/devices/machine/ym3802.cpp
-index 4a8f6a7ffae..d1bf2b961f6 100644
---- a/src/devices/machine/ym3802.cpp
-+++ b/src/devices/machine/ym3802.cpp
-@@ -45,7 +45,7 @@ void ym3802_device::device_start()
- 
- void ym3802_device::device_reset()
- {
--	m_reg.clear();
-+	m_reg.assign(REG_MAX, 0);
- 	reset_irq(0xff);
- 	transmit_register_reset();
- 	receive_register_reset();
\ No newline at end of file