diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/actions/DefaultEditPartSizeAction.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/actions/DefaultEditPartSizeAction.java
index a2169f5ac..18b605103 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/actions/DefaultEditPartSizeAction.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/actions/DefaultEditPartSizeAction.java
@@ -17,7 +17,6 @@
 import com.archimatetool.editor.diagram.commands.SetConstraintObjectCommand;
 import com.archimatetool.editor.diagram.editparts.AbstractConnectedEditPart;
 import com.archimatetool.editor.diagram.figures.AbstractDiagramModelObjectFigure;
-import com.archimatetool.editor.diagram.figures.IDiagramModelObjectFigure;
 import com.archimatetool.editor.ui.IArchiImages;
 import com.archimatetool.model.IBounds;
 import com.archimatetool.model.IDiagramModelContainer;
@@ -90,7 +89,7 @@ private Command createDefaultSizeCommand(List<?> objects) {
                     bounds.setHeight(imageBounds.height);
                 }
                 else {
-                    Dimension defaultSize = ((IDiagramModelObjectFigure)figure).getDefaultSize();
+                    Dimension defaultSize = figure.getDefaultSize();
                     bounds.setWidth(defaultSize.width);
                     bounds.setHeight(defaultSize.height);
                 }
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/editparts/diagram/DiagramImageEditPart.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/editparts/diagram/DiagramImageEditPart.java
index c35323c4c..923581a0d 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/editparts/diagram/DiagramImageEditPart.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/editparts/diagram/DiagramImageEditPart.java
@@ -16,7 +16,6 @@
 
 import com.archimatetool.editor.diagram.editparts.AbstractConnectedEditPart;
 import com.archimatetool.editor.diagram.editparts.IConstrainedSizeEditPart;
-import com.archimatetool.editor.diagram.figures.IDiagramModelObjectFigure;
 import com.archimatetool.editor.diagram.figures.diagram.DiagramImageFigure;
 import com.archimatetool.editor.diagram.policies.BasicConnectionPolicy;
 import com.archimatetool.editor.diagram.policies.PartComponentEditPolicy;
@@ -86,6 +85,6 @@ public void performRequest(Request req) {
 
     @Override
     protected void refreshFigure() {
-        ((IDiagramModelObjectFigure)getFigure()).refreshVisuals();
+        getFigure().refreshVisuals();
     }
 }
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
index c62f82e10..50cfd174c 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
@@ -149,7 +149,7 @@ protected void drawFigure(Graphics graphics) {
     protected Rectangle calculateTextControlBounds() {
         Rectangle bounds = getBounds().getCopy();
         
-        int textPosition = ((ITextPosition)getDiagramModelObject()).getTextPosition();
+        int textPosition = getDiagramModelObject().getTextPosition();
         if(textPosition == ITextPosition.TEXT_POSITION_TOP) {
             bounds.y += 5 - getTextControlMarginHeight();
             bounds.y -= Math.max(3, FigureUtilities.getFontMetrics(getFont()).getLeading());
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageChooserSection.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageChooserSection.java
index baa2f1a6a..2843a34aa 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageChooserSection.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageChooserSection.java
@@ -29,7 +29,6 @@
 
 import com.archimatetool.editor.model.IArchiveManager;
 import com.archimatetool.editor.model.commands.EObjectFeatureCommand;
-import com.archimatetool.model.IAdapter;
 import com.archimatetool.model.IArchimateModel;
 import com.archimatetool.model.IArchimateModelObject;
 import com.archimatetool.model.IArchimatePackage;
@@ -199,7 +198,7 @@ protected void doImagePathCommand(String path) {
     }
     
     protected IArchiveManager getArchiveManager() {
-        return (IArchiveManager)((IAdapter)getFirstSelectedObject()).getAdapter(IArchiveManager.class);
+        return (IArchiveManager)getFirstSelectedObject().getAdapter(IArchiveManager.class);
     }
     
     protected void showError(Throwable ex) {
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageManagerDialog.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageManagerDialog.java
index 686366888..6baa89fa0 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageManagerDialog.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageManagerDialog.java
@@ -220,8 +220,8 @@ public void widgetSelected(SelectionEvent e) {
             @Override
             public void widgetSelected(SelectionEvent e) {
                 if(e.item instanceof GalleryItem) {
-                    fUserSelectedImagePath = (String)((GalleryItem)e.item).getData("imagepath"); //$NON-NLS-1$
-                    fUserSelectedModel = (IArchimateModel)((GalleryItem)e.item).getData("model"); //$NON-NLS-1$
+                    fUserSelectedImagePath = (String)e.item.getData("imagepath"); //$NON-NLS-1$
+                    fUserSelectedModel = (IArchimateModel)e.item.getData("model"); //$NON-NLS-1$
                 }
                 else {
                     fUserSelectedImagePath = null;
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/actions/GenerateViewAction.java b/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/actions/GenerateViewAction.java
index 0cf4b818f..25e01f151 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/actions/GenerateViewAction.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/actions/GenerateViewAction.java
@@ -15,7 +15,6 @@
 
 import com.archimatetool.editor.actions.ArchiActionFactory;
 import com.archimatetool.editor.tools.GenerateViewCommand;
-import com.archimatetool.model.IAdapter;
 import com.archimatetool.model.IArchimateElement;
 import com.archimatetool.model.IArchimateModel;
 import com.archimatetool.model.IArchimateModelObject;
@@ -42,7 +41,7 @@ public void run() {
         if(!selected.isEmpty()) {
             GenerateViewCommand command = new GenerateViewCommand(selected);
             if(command.openDialog(Display.getCurrent().getActiveShell())) {
-                CommandStack commandStack = (CommandStack)((IAdapter)selected.get(0)).getAdapter(CommandStack.class);
+                CommandStack commandStack = (CommandStack)selected.get(0).getAdapter(CommandStack.class);
                 commandStack.execute(command);
             }
         }
diff --git a/com.archimatetool.templates/src/com/archimatetool/templates/wizard/NewModelFromTemplateWizardPage.java b/com.archimatetool.templates/src/com/archimatetool/templates/wizard/NewModelFromTemplateWizardPage.java
index c1260d1bb..73221b737 100644
--- a/com.archimatetool.templates/src/com/archimatetool/templates/wizard/NewModelFromTemplateWizardPage.java
+++ b/com.archimatetool.templates/src/com/archimatetool/templates/wizard/NewModelFromTemplateWizardPage.java
@@ -204,7 +204,7 @@ public void widgetSelected(SelectionEvent e) {
             @Override
             public void widgetSelected(SelectionEvent e) {
                 if(e.item instanceof GalleryItem) {
-                    ITemplate template = (ITemplate)((GalleryItem)e.item).getData();
+                    ITemplate template = (ITemplate)e.item.getData();
                     updateWizard(template);
                 }
                 else {