diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index ad51c5b38a..71151f9df4 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -1,7 +1,7 @@
 // FIXME: This EO doc needs a direct link to the "edcref" doc
 
 class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
-                         Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc,
+                         Efl.Observer, Efl.Layout.Calc,
                          Efl.Layout.Signal, Efl.Layout.Group,
                          Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
                          Efl.Gfx.Size_Class)
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index 058220d00a..e4b10b93d9 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -1,7 +1,7 @@
 class Efl.Canvas.Layout_Part_Invalid (Efl.Canvas.Layout_Part, Efl.Content,
                                       Efl.Pack_Linear, Efl.Ui.Direction,
                                       Efl.Pack_Table, Efl.Text,
-                                      Efl.Text_Markup, Efl.Text_Cursor)
+                                      Efl.Text_Markup)
 {
    [[Common class for part proxy objects for @Efl.Canvas.Layout.
 
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index 4ea5d32349..389c6bcc9f 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -11,8 +11,7 @@ enum Efl.Canvas.Layout_Part_Text_Expand
 }
 
 class Efl.Canvas.Layout_Part_Text (Efl.Canvas.Layout_Part, Efl.Text,
-Efl.Text_Markup, Efl.Text_Cursor, Efl.Text_Format, Efl.Text_Font,
-Efl.Text_Style)
+Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style)
 {
    [[Represents a TEXT part of a layout
 
diff --git a/src/lib/elementary/efl_ui_box_flow.eo b/src/lib/elementary/efl_ui_box_flow.eo
index c0cb2610a4..f4543d7f6b 100644
--- a/src/lib/elementary/efl_ui_box_flow.eo
+++ b/src/lib/elementary/efl_ui_box_flow.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Box_Flow (Efl.Ui.Box, Efl.Pack_Layout)
+class Efl.Ui.Box_Flow (Efl.Ui.Box)
 {
    [[A custom layout engine for @Efl.Ui.Box.]]
    methods {
diff --git a/src/lib/elementary/efl_ui_box_stack.eo b/src/lib/elementary/efl_ui_box_stack.eo
index 05b01cf232..e4bbd5e712 100644
--- a/src/lib/elementary/efl_ui_box_stack.eo
+++ b/src/lib/elementary/efl_ui_box_stack.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Box_Stack (Efl.Ui.Box, Efl.Pack_Layout)
+class Efl.Ui.Box_Stack (Efl.Ui.Box)
 {
    [[A custom layout engine for @Efl.Ui.Box that stacks items.
 
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 851f54e309..ff072a9547 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,6 +1,6 @@
 class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat,
                      Efl.Text, Efl.Content,
-                     Efl.Access.Widget.Action, Efl.Ui.Translatable)
+                     Efl.Access.Widget.Action)
 {
    [[Push-button widget
 
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index 6b3345f4d5..7bf94c62df 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -28,7 +28,7 @@ enum Efl.Ui.Flip_Interaction
    page [[Page interaction]]
 }
 
-class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack_Linear, Efl.Part)
+class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack_Linear)
 {
    [[Efl UI flip class]]
    legacy_prefix: elm_flip;
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 038f257de5..30d7d3646b 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,5 +1,5 @@
 class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
-                    Efl.Ui.Translatable, Efl.Content)
+                    Efl.Content)
 {
    [[Frame widget
 
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index 0f40fafd41..e404af7813 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,6 +1,6 @@
 import efl_ui;
 
-class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
+class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Container, Efl.File,
                      Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Factory,
                      Efl.Layout.Calc, Efl.Layout.Signal,
                      Efl.Layout.Group)
diff --git a/src/lib/elementary/efl_ui_list_default_item.eo b/src/lib/elementary/efl_ui_list_default_item.eo
index 3bd44e6b4f..34a86f7642 100644
--- a/src/lib/elementary/efl_ui_list_default_item.eo
+++ b/src/lib/elementary/efl_ui_list_default_item.eo
@@ -2,7 +2,6 @@
 class Efl.Ui.List_Default_Item (Efl.Ui.List_Item,
                                 Efl.Text,
                                 Efl.Text_Markup,
-                                Efl.Ui.Translatable,
                                 Efl.Content)
 {
    [[List Default Item class.
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index 8b967a2f71..aec3a58b51 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -6,7 +6,7 @@ struct Efl.Ui.List_View_Item_Event
    child: Efl.Model;
    index: int;
 }
-class Efl.Ui.List_View (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
+class Efl.Ui.List_View (Efl.Ui.Layout, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
                 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
                 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager)
 {
diff --git a/src/lib/elementary/efl_ui_navigation_bar.eo b/src/lib/elementary/efl_ui_navigation_bar.eo
index f718bc82c5..a5dd95c7f0 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar (Efl.Ui.Layout, Efl.Content, Efl.Text, Efl.Ui.Translatable)
+class Efl.Ui.Navigation_Bar (Efl.Ui.Layout, Efl.Content, Efl.Text)
 {
    [[Navigation_Bar widget.
 
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index dc296e269b..44bdd98767 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,5 +1,5 @@
 class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
-                          Efl.Ui.Direction, Efl.Access.Value, Efl.Ui.Translatable,
+                          Efl.Ui.Direction, Efl.Access.Value,
                           Efl.Text, Efl.Content, Efl.Text_Markup)
 {
    [[Elementary progressbar class]]
diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo
index 0551cb0687..116fdd39e0 100644
--- a/src/lib/elementary/efl_ui_spin_button.eo
+++ b/src/lib/elementary/efl_ui_spin_button.eo
@@ -1,5 +1,5 @@
 class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Ui.Direction,
-                        Efl.Access.Value, Efl.Access.Widget.Action)
+                          Efl.Access.Widget.Action)
 {
    [[A Button Spin.
 
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 766f42ec03..5cb9e2319e 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -15,7 +15,7 @@ struct Efl.Ui.Widget_Focus_State {
 
 abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
                         Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object,
-                        Efl.Ui.Base, Efl.Ui.Cursor, Efl.Ui.Translatable,
+                        Efl.Ui.Cursor, Efl.Ui.Translatable,
                         Efl.Selection, Efl.Ui.Dnd)
 {
    [[Efl UI widget abstract class]]
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 32abb01d76..000b4e9ebc 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -154,10 +154,10 @@ enum Efl.Ui.Win_Move_Resize_Mode
    right = (1 << 4)    [[Start resizing window to the right]]
 }
 
-class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Access.Window,
+class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Access.Window,
                   Efl.Access.Component, Efl.Access.Widget.Action,
                   Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
-                  Efl.Gfx.Size_Hint, Efl.Text, Efl.Config, Efl.Part,
+                  Efl.Text, Efl.Config,
                   Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root)
 {
    [[Efl UI window class]]
diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo
index 2aba973358..70be521d2e 100644
--- a/src/lib/elementary/elm_mapbuf.eo
+++ b/src/lib/elementary/elm_mapbuf.eo
@@ -1,4 +1,4 @@
-class Elm.Mapbuf (Efl.Ui.Widget, Efl.Content, Efl.Part, Efl.Ui.Legacy)
+class Elm.Mapbuf (Efl.Ui.Widget, Efl.Content, Efl.Ui.Legacy)
 {
    [[Elementary mapbuf class]]
    legacy_prefix: elm_mapbuf;
diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo
index 60c26f3db2..5cfbf805f1 100644
--- a/src/lib/elementary/elm_notify.eo
+++ b/src/lib/elementary/elm_notify.eo
@@ -1,4 +1,4 @@
-class Elm.Notify (Efl.Ui.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Part, Efl.Ui.Legacy)
+class Elm.Notify (Efl.Ui.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy)
 {
    [[Elementary notification class]]
    legacy_prefix: elm_notify;
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index 505c67d8fa..8a786d4dab 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -1,6 +1,5 @@
 class Elm.Slider (Efl.Ui.Slider_Interval, Efl.Ui.Legacy,
-                  Efl.Text, Efl.Text_Markup, Efl.Ui.Format,
-                  Efl.Ui.Translatable)
+                  Efl.Text, Efl.Text_Markup, Efl.Ui.Format)
 {
    [[Elementary slider class]]
    eo_prefix: elm_obj_slider;
diff --git a/src/lib/evas/canvas/efl_canvas_image.eo b/src/lib/evas/canvas/efl_canvas_image.eo
index 7edcb0bc13..4ada80bc2c 100644
--- a/src/lib/evas/canvas/efl_canvas_image.eo
+++ b/src/lib/evas/canvas/efl_canvas_image.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Image (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer,
+class Efl.Canvas.Image (Efl.Canvas.Image_Internal,
                         Efl.Gfx.Image_Load_Controller, Efl.Gfx.Image_Animation_Controller,
                         Efl.File)
 {
diff --git a/src/lib/evas/canvas/efl_canvas_proxy.eo b/src/lib/evas/canvas/efl_canvas_proxy.eo
index 3814dcebeb..62fcc0db02 100644
--- a/src/lib/evas/canvas/efl_canvas_proxy.eo
+++ b/src/lib/evas/canvas/efl_canvas_proxy.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Proxy (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer)
+class Efl.Canvas.Proxy (Efl.Canvas.Image_Internal)
 {
    [[Low-level proxy image object.
 
diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.eo b/src/lib/evas/canvas/efl_canvas_scene3d.eo
index ea875c3df0..7ad87e87fc 100644
--- a/src/lib/evas/canvas/efl_canvas_scene3d.eo
+++ b/src/lib/evas/canvas/efl_canvas_scene3d.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Scene3d (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer)
+class Efl.Canvas.Scene3d (Efl.Canvas.Image_Internal)
 {
    [[A UI view for EFL Canvas 3D.]]
    data: null;
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 617c9dedae..54dc89e263 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -1,7 +1,7 @@
 type @extern Evas.Text_Style_Type : __undefined_type; [[External text style type]]
 
 class Evas.Text (Efl.Canvas.Object, Efl.Text,
-                 Efl.Text_Font, Efl.Canvas.Filter.Internal, Efl.Ui.Base)
+                 Efl.Text_Font, Efl.Canvas.Filter.Internal)
 {
    [[Evas text class]]
    legacy_prefix: evas_object_text;
diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo
index 53e4d017e1..ebd482ec19 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -20,8 +20,7 @@ enum Evas.Textgrid.Font_Style {
 /* XXX: Actual definition is in C. */
 struct Evas.Textgrid.Cell; [[Evas textgrid cell data structure]]
 
-class Evas.Textgrid (Efl.Canvas.Object, Efl.Text_Font,
-                     Efl.Ui.Base)
+class Evas.Textgrid (Efl.Canvas.Object, Efl.Text_Font)
 {
    [[Evas textgrid class]]
    legacy_prefix: evas_object_textgrid;