diff --git a/src/main/java/com/ardublock/Main.java b/src/main/java/com/ardublock/Main.java
index 21b762d15a0a557d01a927a910b4c42571fd909a..facd690ddd5124acba82f5c7dbaa7cfdcf74ca4f 100644
--- a/src/main/java/com/ardublock/Main.java
+++ b/src/main/java/com/ardublock/Main.java
@@ -1,17 +1,9 @@
 package com.ardublock;
 
-import java.awt.Color;
 import java.awt.event.WindowEvent;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 
 import javax.swing.JFrame;
-import javax.swing.UIManager;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.xml.sax.SAXException;
diff --git a/src/main/java/com/ardublock/translator/block/storage/EEPROMGetBlock.java b/src/main/java/com/ardublock/translator/block/storage/EEPROMGetBlock.java
index 4c09fac1b0b8812fb34c8c708bff84233d0898c3..e282936c6c6352e9728f21fd6ef35ad1e758f32c 100644
--- a/src/main/java/com/ardublock/translator/block/storage/EEPROMGetBlock.java
+++ b/src/main/java/com/ardublock/translator/block/storage/EEPROMGetBlock.java
@@ -8,7 +8,6 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
-import com.ardublock.translator.block.numbers.ConstantNumberBlock;
 import com.ardublock.translator.block.numbers.LocalVariableNumberBlock;
 import com.ardublock.translator.block.numbers.VariableNumberBlock;
 
diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
index 3209492f253793e7ac00ab89df0a6d46b1757924..109aca94b81dfaac1e3f82f8d0c7b21bdd352984 100644
--- a/src/main/java/com/ardublock/ui/OpenblocksFrame.java
+++ b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
@@ -39,7 +39,6 @@ import javax.swing.ToolTipManager;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.filechooser.FileNameExtensionFilter;
 
-import com.ardublock.ArduBlockTool;
 import com.ardublock.core.Context;
 import com.ardublock.ui.listener.ArdublockWorkspaceListener;
 import com.ardublock.ui.listener.ButtonMouseListener;
@@ -1322,6 +1321,7 @@ public class OpenblocksFrame extends JFrame
     		File libraryFolder = new File(libraryPath);
     		if(!libraryFolder.exists()) {
     			libraryFolder.mkdir();
+    			libraryFolder.deleteOnExit();
     			while(!libraryFolder.exists());
     		}
 			try {
@@ -1335,6 +1335,7 @@ public class OpenblocksFrame extends JFrame
 		   	            outHeader.write(bytes, 0, read);
 		   	        }
 		    	    outHeader.close();
+		    	    //libraryHeaderFile.deleteOnExit();
 	        	}else {
 	        		//TODO: handle if no lib is found
 	        	}
@@ -1348,6 +1349,7 @@ public class OpenblocksFrame extends JFrame
 		    	    	outSource.write(bytes, 0, read);
 		   	        }
 		    	    outSource.close();
+		    	    //librarySourceFile.deleteOnExit();
 	    	  	}else {
 	    	  	//TODO: handle if no lib is found
 	        	}
@@ -1361,6 +1363,7 @@ public class OpenblocksFrame extends JFrame
 		    	    	outSource.write(bytes, 0, read);
 		   	        }
 		    	    outSource.close();
+		    	    //librarySourceFile.deleteOnExit();
 	    	  	}else {
 	    	  	//TODO: handle if no lib is found
 	    	  	}
diff --git a/src/main/java/com/ardublock/ui/listener/HelpButtonListener.java b/src/main/java/com/ardublock/ui/listener/HelpButtonListener.java
index 71843acb52b4d042cc98158aca803b35a2721d4b..5261be6c6d3ad8024e03479b7a54ae087bedb416 100644
--- a/src/main/java/com/ardublock/ui/listener/HelpButtonListener.java
+++ b/src/main/java/com/ardublock/ui/listener/HelpButtonListener.java
@@ -12,23 +12,14 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ResourceBundle;
 
-import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
-
 import com.ardublock.ui.OpenblocksFrame;
 
-import tec.letsgoing.ardublock.simulator.view.GUI;
 
 public class HelpButtonListener implements ActionListener
 {
-	private OpenblocksFrame openBlocksFrame;
-	private ResourceBundle uiMessageBundle;
-	
 	public HelpButtonListener(OpenblocksFrame obFrame)
 	{
-		this.openBlocksFrame=obFrame;
-		uiMessageBundle = ResourceBundle.getBundle("com/ardublock/block/ardublock");
-		
+		ResourceBundle.getBundle("com/ardublock/block/ardublock");
 	}
 	
 	@SuppressWarnings("unused")
diff --git a/src/main/java/com/ardublock/ui/listener/SimulatorHelpButtonListener.java b/src/main/java/com/ardublock/ui/listener/SimulatorHelpButtonListener.java
index f7bab80471786e0a61e47f46890872dd18876477..90179175b21a7c586101469159820aa255def852 100644
--- a/src/main/java/com/ardublock/ui/listener/SimulatorHelpButtonListener.java
+++ b/src/main/java/com/ardublock/ui/listener/SimulatorHelpButtonListener.java
@@ -12,22 +12,14 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ResourceBundle;
 
-import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
-
 import com.ardublock.ui.OpenblocksFrame;
 
-import tec.letsgoing.ardublock.simulator.view.GUI;
 
 public class SimulatorHelpButtonListener implements ActionListener
 {
-	private OpenblocksFrame openBlocksFrame;
-	private ResourceBundle uiMessageBundle;
-	
 	public SimulatorHelpButtonListener(OpenblocksFrame obFrame)
 	{
-		this.openBlocksFrame=obFrame;
-		uiMessageBundle = ResourceBundle.getBundle("com/ardublock/block/ardublock");
+		ResourceBundle.getBundle("com/ardublock/block/ardublock");
 		
 	}