1 files changed, 2 insertions, 13 deletions
diff --git a/src/com/itmill/toolkit/ui/ExpandLayout.java b/src/com/itmill/toolkit/ui/ExpandLayout.java
index 100fac872c..79cc69c1f1 100644
--- a/src/com/itmill/toolkit/ui/ExpandLayout.java
+++ b/src/com/itmill/toolkit/ui/ExpandLayout.java
@@ -6,10 +6,8 @@ package com.itmill.toolkit.ui;
 
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Size;
 
 /**
  * TODO finish documentation
@@ -26,14 +24,12 @@ import com.itmill.toolkit.terminal.Size;
  * other components don't use. Or just provide expanded container.
  * 
  */
-public class ExpandLayout extends OrderedLayout implements HasSize {
+public class ExpandLayout extends OrderedLayout {
 
     private Component expanded;
-    private Size size;
 
     public ExpandLayout() {
-        size = new Size(this);
-        size.setSizeFull();
+        setSizeFull();
     }
 
     public ExpandLayout(int orientation) {
@@ -64,9 +60,6 @@ public class ExpandLayout extends OrderedLayout implements HasSize {
             target.addAttribute("spacing", true);
         }
 
-        // Size
-        size.paint(target);
-
         // Adds the attributes: orientation
         // note that the default values (b/vertival) are omitted
         if (getOrientation() == ORIENTATION_HORIZONTAL) {
@@ -133,8 +126,4 @@ public class ExpandLayout extends OrderedLayout implements HasSize {
         }
     }
 
-    public Size getSize() {
-        return size;
-    }
-
 }