diff --git a/include/gpu/GrUserConfig.h b/include/gpu/GrUserConfig.h
index 9f616388c..657f74f02 100644
--- a/include/gpu/GrUserConfig.h
+++ b/include/gpu/GrUserConfig.h
@@ -21,27 +21,12 @@
     #define GR_DEBUG    1
 #endif
 
-/*
- *  The default 32bit pixel config for texture upload is GL_RGBA on all
- *  platforms except on Windows where it is GL_BGRA. If your bitmaps map to a
- *  different GL enum, specify that with this define. For portability use
- *  GR_BGRA rather than GL_BGRA for platforms where this format is an
- *  extension.
- */
-//#define GR_GL_32BPP_COLOR_FORMAT  GL_RGBA
-
 /*
  *  To diagnose texture cache performance, define this to 1 if you want to see
  *  a log statement everytime we upload an image to create a texture.
  */
 //#define GR_DUMP_TEXTURE_UPLOAD    1
 
-/*
- * To log all GL calls define this. Can be turned on and off at runtime by
- * gPrintGL global variable.
- */
-//#define GR_GL_LOG_CALLS 1
-
 /*
  * When drawing rects this causes Ganesh to use a vertex buffer containing
  * a unit square that is positioned by a matrix. Enable on systems where
@@ -63,11 +48,6 @@
  */
 //#define GR_GEOM_BUFFER_LOCK_THRESHOLD (1<<15)
 
-///////////////////////////////////////////////////////////////////////////////
-/*
- *  temporary flags (may go away soon)
- */
-
 ///////////////////////////////////////////////////////////////////////////////
 // Decide Ganesh types