diff --git a/gfx/common/rsx_common.h b/gfx/common/rsx_common.h
index 44f3ce9e89..d7e16d6cf8 100644
--- a/gfx/common/rsx_common.h
+++ b/gfx/common/rsx_common.h
@@ -38,8 +38,6 @@
 #define RSX_MAX_TEXTURE_VERTICES 4096 // Set > 0 for preallocated texture vertices
 #define RSX_MAX_FONT_VERTICES 8192
 
-#define GFX_MAX_SHADERS RSX_MAX_SHADERS
-
 /* Shader objects */
 extern const u8 modern_opaque_vpo_end[];
 extern const u8 modern_opaque_vpo[];
diff --git a/gfx/drivers/rsx_gfx.c b/gfx/drivers/rsx_gfx.c
index cf4643d129..07328dcd36 100644
--- a/gfx/drivers/rsx_gfx.c
+++ b/gfx/drivers/rsx_gfx.c
@@ -1243,7 +1243,6 @@ static bool rsx_suppress_screensaver(void* data, bool enable) { return false; }
 
 static void rsx_free(void* data)
 {
-   int i;
    rsx_t* gcm = (rsx_t*)data;
 
    if (!gcm)
@@ -1274,9 +1273,7 @@ static void rsx_free(void* data)
      rsxFree(gcm->depth_buffer);
    if (gcm->fp_buffer)
      rsxFree(gcm->fp_buffer);
-#endif
 
-#if 0
    rsxFinish(gcm->context, 1);
    free(gcm->host_addr);
 #endif