diff --git a/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java b/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
index 91621339b4..25f1eab9c5 100644
--- a/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
+++ b/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
@@ -23,7 +23,6 @@ import org.apache.poi.hslf.record.TextHeaderAtom;
 
 import java.io.IOException;
 import java.io.FileOutputStream;
-import java.io.File;
 import java.awt.*;
 
 /**
diff --git a/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java b/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
index c20a2f186f..010bf6d6b8 100644
--- a/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
+++ b/src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java
@@ -18,10 +18,8 @@
 package org.apache.poi.hslf.examples;
 
 import org.apache.poi.hslf.usermodel.SlideShow;
-import org.apache.poi.hslf.usermodel.RichTextRun;
 import org.apache.poi.hslf.model.*;
 
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.awt.*;
 
diff --git a/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java b/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java
index b3d85640e0..8d7921146a 100644
--- a/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java
+++ b/src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java
@@ -22,7 +22,6 @@ import org.apache.poi.hslf.model.*;
 
 import java.awt.*;
 import java.io.FileOutputStream;
-import java.io.FileInputStream;
 
 /**
  * Demonstrates how to draw into a slide using the HSLF Graphics2D driver.
diff --git a/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java b/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java
index 2371f0fbf6..99037d3264 100644
--- a/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java
+++ b/src/examples/src/org/apache/poi/hslf/examples/PPT2PNG.java
@@ -19,16 +19,12 @@ package org.apache.poi.hslf.examples;
 
 import org.apache.poi.hslf.usermodel.*;
 import org.apache.poi.hslf.model.*;
-import org.apache.poi.hslf.record.TextHeaderAtom;
 
 import javax.imageio.ImageIO;
-import java.io.IOException;
 import java.io.FileOutputStream;
-import java.io.File;
 import java.io.FileInputStream;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 
 /**
diff --git a/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java
index 11d2a3345e..bb6f19d0a5 100644
--- a/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java
+++ b/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmeddedObjects.java
@@ -43,11 +43,11 @@ public class EmeddedObjects {
                 //System.out.println(entry.getName() + ": " + embeddedWorkbook.getNumberOfSheets());
             } else if (oleName.equals("Document")) {
                 DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-                HWPFDocument embeddedWordDocument = new HWPFDocument(dn, fs);
+                HWPFDocument embeddedWordDocument = new HWPFDocument(dn);
                 //System.out.println(entry.getName() + ": " + embeddedWordDocument.getRange().text());
             }  else if (oleName.equals("Presentation")) {
                 DirectoryNode dn = (DirectoryNode) obj.getDirectory();
-                SlideShow embeddedPowerPointDocument = new SlideShow(new HSLFSlideShow(dn, fs));
+                SlideShow embeddedPowerPointDocument = new SlideShow(new HSLFSlideShow(dn));
                 //System.out.println(entry.getName() + ": " + embeddedPowerPointDocument.getSlides().length);
             } else {
                 if(obj.hasDirectoryEntry()){
diff --git a/src/examples/src/org/apache/poi/ss/examples/formula/UserDefinedFunctionExample.java b/src/examples/src/org/apache/poi/ss/examples/formula/UserDefinedFunctionExample.java
index cd02b6433a..74dca7d1b6 100644
--- a/src/examples/src/org/apache/poi/ss/examples/formula/UserDefinedFunctionExample.java
+++ b/src/examples/src/org/apache/poi/ss/examples/formula/UserDefinedFunctionExample.java
@@ -23,7 +23,6 @@ import java.io.IOException ;
 
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException ;
 import org.apache.poi.ss.formula.functions.FreeRefFunction ;
-import org.apache.poi.ss.formula.udf.AggregatingUDFFinder ;
 import org.apache.poi.ss.formula.udf.DefaultUDFFinder ;
 import org.apache.poi.ss.formula.udf.UDFFinder ;
 import org.apache.poi.ss.usermodel.*;
diff --git a/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial2.java b/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial2.java
index d3200755ae..373f01f33f 100755
--- a/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial2.java
+++ b/src/examples/src/org/apache/poi/xslf/usermodel/Tutorial2.java
@@ -20,7 +20,6 @@
 package org.apache.poi.xslf.usermodel;
 
 import java.awt.*;
-import java.awt.geom.Rectangle2D;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
diff --git a/src/examples/src/org/apache/poi/xwpf/usermodel/SimpleImages.java b/src/examples/src/org/apache/poi/xwpf/usermodel/SimpleImages.java
index 01e7a8bd83..10e48d1aed 100755
--- a/src/examples/src/org/apache/poi/xwpf/usermodel/SimpleImages.java
+++ b/src/examples/src/org/apache/poi/xwpf/usermodel/SimpleImages.java
@@ -19,12 +19,9 @@
 package org.apache.poi.xwpf.usermodel;
 
 import org.apache.poi.util.Units;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.math.BigInteger;
-import java.util.List;
 
 /**
  * Demonstrates how to add pictures in a .docx document