diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index 75496c6b5f..e0649290ef 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -60,7 +60,6 @@ STATIC void machine_mem_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     mp_printf(print, "<%u-bit memory>", 8 * self->elem_size);
 }
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t machine_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     // TODO support slice index to read/write multiple values at once
     machine_mem_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index bf5f1cef73..451dc29ed9 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -518,7 +518,6 @@ STATIC void uctypes_struct_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t base_in, mp_obj_t index_in, mp_obj_t value) {
     mp_obj_uctypes_struct_t *self = mp_instance_cast_to_native_base(base_in, &uctypes_struct_type);
 
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index e18a26f3c6..8ec5ae54d9 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -241,7 +241,6 @@ STATIC void get_jclass_name(jobject obj, char *buf) {
     check_exception();
 }
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t jobject_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_jobject_t *self = self_in;
     mp_uint_t idx = mp_obj_get_int(index);
diff --git a/py/objdict.c b/py/objdict.c
index 5bbe939b1d..683fcb748e 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -174,7 +174,6 @@ mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index) {
     }
 }
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete
diff --git a/py/objlist.c b/py/objlist.c
index 64381bc706..b32f82085e 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -158,7 +158,6 @@ STATIC mp_obj_t list_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
     }
 }
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_list_t *self = mp_instance_cast_to_native_base(self_in, &mp_type_list);
     if (value == MP_OBJ_NULL) {
diff --git a/py/objrange.c b/py/objrange.c
index 6f14bcc9f9..30d55c56cd 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -158,7 +158,6 @@ STATIC mp_obj_t range_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
 }
 #endif
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     if (value == MP_OBJ_SENTINEL) {
         // load
diff --git a/py/objstr.c b/py/objstr.c
index 567e734442..fde2646815 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -439,7 +439,6 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
 #endif
 
 // This is used for both bytes and 8-bit strings. This is not used for unicode strings.
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_type_t *type = mp_obj_get_type(self_in);
     GET_STR_DATA_LEN(self_in, self_data, self_len);
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 2540a1d7b6..30000a51e7 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -197,7 +197,6 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
     return s;
 }
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_type_t *type = mp_obj_get_type(self_in);
     assert(type == &mp_type_str);
diff --git a/py/objtuple.c b/py/objtuple.c
index b7f50d3b2c..2b483f8b83 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -177,7 +177,6 @@ mp_obj_t mp_obj_tuple_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
     }
 }
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
 
     if (value == MP_OBJ_SENTINEL) {
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index ca9484a408..91c17f2d13 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -133,7 +133,6 @@ const mp_obj_property_t displayio_bitmap_height_obj = {
 //|
 //|       bitmap[0,1] = 3
 //|
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) {
     if (value_obj == mp_const_none) {
         // delete item
diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index f5e3c22634..dd7600eb9c 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -310,7 +310,6 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|
 //|       del group[0]
 //|
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) {
     displayio_group_t *self = native_group(self_in);
 
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
index 903338abb2..dda58e3c53 100644
--- a/shared-bindings/displayio/Palette.c
+++ b/shared-bindings/displayio/Palette.c
@@ -95,7 +95,6 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|       palette[2] = b'\xff\xff\x00\x00'          # set using 4 bytes
 //|       palette[3] = bytearray(b'\x00\x00\xFF')   # set using a bytearay of 3 or 4 bytes
 //|
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 STATIC mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item