diff --git a/src/main/java/ch/psi/fda/ui/AcquisitionMain.java b/src/main/java/ch/psi/fda/ui/AcquisitionMain.java
index f88cd10..27182a2 100644
--- a/src/main/java/ch/psi/fda/ui/AcquisitionMain.java
+++ b/src/main/java/ch/psi/fda/ui/AcquisitionMain.java
@@ -71,7 +71,6 @@ import ch.psi.jcae.impl.DefaultChannelService;
 /**
  * Entry class for command line based data acquisition
  */
-@SuppressWarnings("restriction")
 public class AcquisitionMain {
 
 	private static Logger logger = Logger.getLogger(AcquisitionMain.class.getName());
diff --git a/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java b/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java
index 5109ac6..758d274 100644
--- a/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java
+++ b/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java
@@ -65,7 +65,6 @@ import ch.psi.fda.messages.EndOfStreamMessage;
 import ch.psi.fda.ui.visualizer.Visualizer;
 import ch.psi.fda.vdescriptor.VDescriptor;
 
-@SuppressWarnings("restriction")
 public class RemoteAcquisitionMain {
 
 	private static Logger logger = Logger.getLogger(RemoteAcquisitionMain.class.getName());
diff --git a/src/main/java/ch/psi/fda/ui/VisualizationMain.java b/src/main/java/ch/psi/fda/ui/VisualizationMain.java
index f42a551..355124b 100644
--- a/src/main/java/ch/psi/fda/ui/VisualizationMain.java
+++ b/src/main/java/ch/psi/fda/ui/VisualizationMain.java
@@ -34,7 +34,6 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 import javax.swing.ScrollPaneLayout;
-import javax.xml.bind.JAXBException;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -44,7 +43,6 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.xml.sax.SAXException;
 
 import com.google.common.eventbus.AsyncEventBus;
 import com.google.common.eventbus.EventBus;