diff --git a/src/evas/eflpp_evas.cpp b/src/evas/eflpp_evas.cpp
index ee040f0..9e31292 100644
--- a/src/evas/eflpp_evas.cpp
+++ b/src/evas/eflpp_evas.cpp
@@ -404,102 +404,6 @@ bool EvasObject::hasFocus() const
     return evas_object_focus_get( o );
 }
 
-/*bool EvasObject::handleMouseIn( const EvasMouseInEvent& e )
-{
-    Dout( dc::notice, *this << " handleMouseIn" );
-    return false;
-}
-
-bool EvasObject::handleMouseOut( const EvasMouseOutEvent& e )
-{
-    Dout( dc::notice, *this << " handleMouseOut" );
-    return false;
-}
-
-bool EvasObject::handleMouseDown( const EvasMouseDownEvent& e )
-{
-    Dout( dc::notice, *this << " handleMouseDown" );
-    return false;
-}
-
-bool EvasObject::handleMouseUp( const EvasMouseUpEvent& e )
-{
-    Dout( dc::notice, *this << " handleMouseUp" );
-    return false;
-}
-
-bool EvasObject::handleMouseMove( const EvasMouseMoveEvent& e )
-{
-    Dout( dc::notice, *this << " handleMouseMove" );
-    return false;
-}
-
-bool EvasObject::handleMouseWheel( const EvasMouseWheelEvent& e )
-{
-    Dout( dc::notice, *this << " handleMouseWheel" );
-    return false;
-}
-
-bool EvasObject::handleFree()
-{
-    Dout( dc::notice, *this << " handleFree" );
-    return false;
-}
-
-bool EvasObject::handleKeyDown( const EvasKeyDownEvent& e )
-{
-    Dout( dc::notice, *this << " handleKeyDown" );
-    return false;
-}
-
-bool EvasObject::handleKeyUp( const EvasKeyUpEvent& e )
-{
-    Dout( dc::notice, *this << " handleKeyUp" );
-    return false;
-}
-
-bool EvasObject::handleFocusIn()
-{
-    Dout( dc::notice, *this << " handleFocusIn" );
-    return false;
-}
-
-bool EvasObject::handleFocusOut()
-{
-    Dout( dc::notice, *this << " handleFocusIn" );
-    return false;
-}
-
-bool EvasObject::handleShow()
-{
-    Dout( dc::notice, *this << " handleShow" );
-    return false;
-}
-
-bool EvasObject::handleHide()
-{
-    Dout( dc::notice, *this << " handleMouseIn" );
-    return false;
-}
-
-bool EvasObject::handleMove()
-{
-    Dout( dc::notice, *this << " handleMove" );
-    return false;
-}
-
-bool EvasObject::handleResize()
-{
-    Dout( dc::notice, *this << " handleResize" );
-    return false;
-}
-
-bool EvasObject::handleRestack()
-{
-    Dout( dc::notice, *this << " handleRestack" );
-    return false;
-}*/
-
 EvasObject* EvasObject::objectLink( Evas_Object* evas_object )
 {
     return static_cast<EvasObject*>( evas_object_data_get( evas_object, "obj_c++" ) );
diff --git a/src/evas/eflpp_evas.h b/src/evas/eflpp_evas.h
index 09f26ca..5e92341 100644
--- a/src/evas/eflpp_evas.h
+++ b/src/evas/eflpp_evas.h
@@ -122,7 +122,7 @@ class EvasObject
     Evas_Object* obj() const { return o; };
     EvasCanvas* canvas() const { return _canvas; }; // FIXME: Rename to parent() ?
     
-    // event signals
+    /* event signals */
     sigc::signal <bool, const EvasMouseInEvent&> signalHandleMouseIn;
     sigc::signal <bool, const EvasMouseOutEvent&> signalHandleMouseOut;
     sigc::signal <bool, const EvasMouseDownEvent&> signalHandleMouseDown;
@@ -191,24 +191,6 @@ class EvasObject
     virtual void setFocus( bool focus );
     virtual bool hasFocus() const;
 
-    /* Events */
-    /*virtual bool handleMouseIn( const EvasMouseInEvent& );
-    virtual bool handleMouseOut( const EvasMouseOutEvent& );
-    virtual bool handleMouseDown( const EvasMouseDownEvent& );
-    virtual bool handleMouseUp( const EvasMouseUpEvent& );
-    virtual bool handleMouseMove( const EvasMouseMoveEvent& );
-    virtual bool handleMouseWheel( const EvasMouseWheelEvent& );
-    virtual bool handleFree();
-    virtual bool handleKeyDown( const EvasKeyDownEvent& );
-    virtual bool handleKeyUp( const EvasKeyUpEvent& );
-    virtual bool handleFocusIn();
-    virtual bool handleFocusOut();
-    virtual bool handleShow();
-    virtual bool handleHide();
-    virtual bool handleMove();
-    virtual bool handleResize();
-    virtual bool handleRestack();*/
-
   private:
     static EvasObject* objectLink( Evas_Object* evas_object = 0 );
     void registerCallbacks();