diff --git a/apps/sam/java/src/net/i2p/sam/SAMBridge.java b/apps/sam/java/src/net/i2p/sam/SAMBridge.java
index a528e7ae2..27f2af5a8 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMBridge.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMBridge.java
@@ -244,8 +244,8 @@ public class SAMBridge implements Runnable, ClientApp {
             FileOutputStream out = null;
             try {
                 out = new FileOutputStream(persistFilename);
-                for (Iterator iter = nameToPrivKeys.keySet().iterator(); iter.hasNext(); ) {
-                    String name = (String)iter.next();
+                for (Iterator<String> iter = nameToPrivKeys.keySet().iterator(); iter.hasNext(); ) {
+                    String name = iter.next();
                     String privKeys = nameToPrivKeys.get(name);
                     out.write(name.getBytes());
                     out.write('=');
diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
index 0c02f1e75..50f1352fd 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
@@ -381,15 +381,15 @@ public class SAMStreamSession {
      */
     private void removeAllSocketHandlers() {
         Integer id;
-        Set keySet;
-        Iterator iter;
+        Set<Integer> keySet;
+        Iterator<Integer> iter;
 
         synchronized (handlersMapLock) {
             keySet = handlersMap.keySet();
             iter = keySet.iterator();
             
             while (iter.hasNext()) {
-                 id = (Integer)iter.next();
+                 id = iter.next();
                  handlersMap.get(id).stopRunning();
                  sendersMap.get(id).shutDownGracefully();
             }
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
index 40e049b9b..c8c3361f8 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
@@ -8,7 +8,6 @@ package net.i2p.sam;
  *
  */
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.ConnectException;
@@ -16,12 +15,9 @@ import java.net.NoRouteToHostException;
 import java.util.Properties;
 
 import net.i2p.I2PException;
-import net.i2p.client.I2PClient;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketManagerFactory;
 import net.i2p.client.streaming.I2PSocketOptions;
-import net.i2p.data.Base64;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.I2PAppThread;