diff --git a/gfx/gl.c b/gfx/gl.c
index 5e3f3b2d2e..213ec38d75 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -1401,13 +1401,6 @@ static bool gl_xml_shader(void *data, const char *path)
 {
    gl_t *gl = (gl_t*)data;
 
-   //if (!gl_check_error())
-   //   SSNES_WARN("Error happened before deinit!\n");
-
-
-   //if (!gl_check_error())
-   //   SSNES_WARN("Error happened in deinit!\n");
-
 #ifdef HAVE_FBO
    if (gl->fbo_inited)
    {
@@ -1425,9 +1418,6 @@ static bool gl_xml_shader(void *data, const char *path)
 
    gl_shader_deinit();
 
-   //if (!gl_check_error())
-   //   SSNES_WARN("Failed to deinit rendering path properly!\n");
-
    if (!gl_glsl_init(path))
       return false;
 
diff --git a/gfx/sdl_gfx.c b/gfx/sdl_gfx.c
index 6e1cc99245..d5ad073ad0 100644
--- a/gfx/sdl_gfx.c
+++ b/gfx/sdl_gfx.c
@@ -263,9 +263,7 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
    unsigned full_y = video_info->current_h;
    SSNES_LOG("Detecting desktop resolution %ux%u.\n", full_x, full_y);
 
-#ifndef XENON
    sdl_input_t *sdl_input = NULL;
-#endif
    const SDL_PixelFormat *fmt = NULL;
 
    if (!video->fullscreen)
@@ -314,7 +312,6 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
       goto error;
    }
 
-#ifndef XENON
    sdl_input = (sdl_input_t*)input_sdl.init();
    if (sdl_input)
    {
@@ -322,12 +319,10 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
       *input_data = sdl_input;
    }
    else
-#else
    {
       *input = NULL;
       *input_data = NULL;
    }
-#endif
 
    vid->rgb32 = video->rgb32;