diff --git a/board/raspberrypi/motioneye-modules/boardctl.py b/board/raspberrypi/motioneye-modules/boardctl.py
index e1cb09b2c3..d4bd1d3f25 100644
--- a/board/raspberrypi/motioneye-modules/boardctl.py
+++ b/board/raspberrypi/motioneye-modules/boardctl.py
@@ -30,8 +30,7 @@ OVERCLOCK = {
     800: '800|250|400|0',
     900: '900|250|450|0',
     950: '950|250|450|0',
-    1000: '1000|500|600|6',
-    1001: '1001|500|500|2'
+    1000: '1000|500|600|6'
 }
 
 def _get_board_settings():
@@ -222,8 +221,7 @@ def overclock():
             ('800|250|400|0', 'modest (800/250/400/0)'),
             ('900|250|450|0', 'medium (900/250/450/0)'),
             ('950|250|450|0', 'high (950/250/450/0)'),
-            ('1000|500|600|6', 'turbo (1000/500/600/6)'),
-            ('1001|500|500|2', 'Pi2 (1000/500/500/2)')
+            ('1000|500|600|6', 'turbo (1000/500/600/6)')
         ],
         'section': 'expertSettings',
         'advanced': True,
diff --git a/board/raspberrypi2/motioneye-modules/boardctl.py b/board/raspberrypi2/motioneye-modules/boardctl.py
index e1cb09b2c3..371546d132 100644
--- a/board/raspberrypi2/motioneye-modules/boardctl.py
+++ b/board/raspberrypi2/motioneye-modules/boardctl.py
@@ -56,7 +56,7 @@ def _get_board_settings():
                 name = name.strip()
                 value = value.strip()
 
-                if name.startswith('gpu_mem'):
+                if name == 'gpu_mem':
                     gpu_mem = int(value)
                 
                 elif name == 'arm_freq':
@@ -115,7 +115,7 @@ def _set_board_settings(s):
             
             seen.add(name)
 
-            if name.startswith('gpu_mem'):
+            if name == 'gpu_mem':
                 lines[i] = '%s=%s' % (name, s['gpuMem'])
 
             elif name == 'arm_freq':
@@ -136,12 +136,6 @@ def _set_board_settings(s):
     if 'gpu_mem' not in seen:
         lines.append('gpu_mem=%s' % s['gpuMem'])
 
-    if 'gpu_mem_256' not in seen:
-        lines.append('gpu_mem_256=%s' % s['gpuMem'])
-
-    if 'gpu_mem_512' not in seen:
-        lines.append('gpu_mem_512=%s' % s['gpuMem'])
-
     if 'arm_freq' not in seen:
         lines.append('arm_freq=%s' % arm_freq)
 
@@ -186,7 +180,7 @@ def gpuMem():
         'description': 'set the amount of memory reserved for the GPU (choose at least 96MB if you use the CSI camera board)',
         'type': 'number',
         'min': '16',
-        'max': '448',
+        'max': '960',
         'section': 'expertSettings',
         'advanced': True,
         'reboot': True,