diff --git a/map/window_handle.hpp b/map/window_handle.hpp
index 872f5dad16..6fb40edc2e 100644
--- a/map/window_handle.hpp
+++ b/map/window_handle.hpp
@@ -15,18 +15,17 @@ namespace yg
 
 class WindowHandle
 {
-private:
-
+  // iOS realization needs this parameter.
+  // Desktop realization holds DrawerYG in draw_widget.hpp.
   shared_ptr<DrawerYG> m_drawer;
+
   shared_ptr<yg::gl::RenderContext> m_renderContext;
 
   bool m_hasPendingUpdates;
   bool m_isUpdatesEnabled;
 
 public:
-
-  WindowHandle() : m_hasPendingUpdates(false), m_isUpdatesEnabled(true)
-  {}
+  WindowHandle() : m_hasPendingUpdates(false), m_isUpdatesEnabled(true) {}
 
   shared_ptr<DrawerYG> const & drawer()
   {
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index a460f458fd..6ec91e2955 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -164,7 +164,7 @@ namespace qt
   {
     widget_type::initializeGL();
     m_handle->setRenderContext(renderContext());
-    m_handle->setDrawer(GetDrawer());
+    //m_handle->setDrawer(GetDrawer());
     m_framework.initializeGL(renderContext(), resourceManager());
   }
 
diff --git a/qt/widgets.hpp b/qt/widgets.hpp
index c2fe9cccd6..c70af3c3a9 100644
--- a/qt/widgets.hpp
+++ b/qt/widgets.hpp
@@ -19,17 +19,13 @@ namespace qt
   /// Widget uses yg for drawing.
   class GLDrawWidget : public GLDrawWidgetT<DrawerYG>
   {
-  private:
-
     typedef GLDrawWidgetT<DrawerYG> base_type;
     shared_ptr<yg::gl::RenderContext> m_renderContext;
 
   protected:
-
     shared_ptr<yg::ResourceManager> m_resourceManager;
 
   public:
-
     typedef DrawerYG drawer_t;
 
     GLDrawWidget(QWidget * pParent);
diff --git a/qt_tstfrm/widgets.hpp b/qt_tstfrm/widgets.hpp
index 7456d82d69..50ca28f3f9 100644
--- a/qt_tstfrm/widgets.hpp
+++ b/qt_tstfrm/widgets.hpp
@@ -31,14 +31,11 @@ namespace qt
   template <class T> class GLDrawWidgetT : public BaseDrawWidget<T, QGLWidget>
   {
     typedef BaseDrawWidget<T, QGLWidget> base_type;
-  protected:
 
+  protected:
     shared_ptr<T> m_p;
 
   public:
-
-    shared_ptr<T> GetDrawer() {return m_p;}
-
     GLDrawWidgetT(QWidget * pParent) : base_type(pParent){}
     virtual ~GLDrawWidgetT();