diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 702d853..e8283d0 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -36,7 +36,7 @@ is divided into following sections:
         <property file="nbproject/private/private.properties"/>
     </target>
     <target depends="-pre-init,-init-private" name="-init-libraries">
-        <property location="./lib/nblibraries.properties" name="libraries.1.path"/>
+        <property location="lib/nblibraries.properties" name="libraries.1.path"/>
         <dirname file="${libraries.1.path}" property="libraries.1.dir.nativedirsep"/>
         <pathconvert dirsep="/" property="libraries.1.dir">
             <path path="${libraries.1.dir.nativedirsep}"/>
diff --git a/nbproject/configs/dist.properties b/nbproject/configs/dist.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 5bfecf5..87d635c 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=3a7a628a
 build.xml.stylesheet.CRC32=958a1d3e
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=aeee674a
-nbproject/build-impl.xml.script.CRC32=07ee5371
+nbproject/build-impl.xml.data.CRC32=afb4810b
+nbproject/build-impl.xml.script.CRC32=eed6b88e
 nbproject/build-impl.xml.stylesheet.CRC32=65b8de21
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 8b05d6d..2391cef 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -23,13 +23,11 @@ dist.dir=dist
 dist.jar=${dist.dir}/wiigee-lib.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 excludes=
-file.reference.bluecove-2.0.3.jar=lib/bluecove-2.0.3.jar
-file.reference.jsr256.jar=lib/jsr256.jar
+file.reference.bluecove-2.1.0.jar=lib/bluecove-2.1.0.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.jsr256.jar}:\
-    ${file.reference.bluecove-2.0.3.jar}
+    ${file.reference.bluecove-2.1.0.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 07927fd..2d55e43 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -13,7 +13,7 @@
             </test-roots>
         </data>
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-            <definitions>./lib/nblibraries.properties</definitions>
+            <definitions>lib/nblibraries.properties</definitions>
         </libraries>
     </configuration>
 </project>
diff --git a/src/device/JSR256Phone.java b/src/device/JSR256Phone.java
deleted file mode 100755
index 5be5f8a..0000000
--- a/src/device/JSR256Phone.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
- * 
- * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
- *
- * This file is part of wiigee.
- *
- * wiigee is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package device;
-
-import java.io.IOException;
-
-import javax.microedition.io.Connector;
-import javax.microedition.sensor.Data;
-import javax.microedition.sensor.DataListener;
-import javax.microedition.sensor.SensorConnection;
-import javax.microedition.sensor.SensorInfo;
-import javax.microedition.sensor.SensorManager;
-
-/**
- * @author Benjamin 'BePo' Poppinga
- * This class represents the basic functions of a JSR256 enabled mobile phone.
- * You need the JSR256 specifications to compile this code correctly. Your device
- * should be J2ME v1.5 enabled, most mobile phones are at J2ME 1.4.2 at the moment.
- * So, with this restrictions, this is more or less only a template you can continue
- * developing with.
- *
- */
-public class JSR256Phone extends Device implements DataListener {
-
-	private SensorConnection sensor;
-	
-	public JSR256Phone() throws IOException {
-		super();
-		// TODO: define buttons, depending on device
-		this.sensor = (SensorConnection) Connector.open(this.getSensorURL());
-		this.sensor.setDataListener(this, 1);
-	}
-	
-	/**
-	 * @author Benjamin 'BePo' Poppinga
-	 * Called from DataListener, JSR 256, if an acceleration happend.
-	 */
-	public void dataReceived(SensorConnection sensor, Data[] data, boolean arg2) {
-		
-		int x=0, y=0, z=0;
-		double[] acc = new double[3];
-		
-		for(int i=0; i<data.length; i++) {
-			if(data[i].getChannelInfo().getName().compareTo("axis_x") == 0) {
-				x = data[i].getIntValues()[0];
-			} else if(data[i].getChannelInfo().getName().compareTo("axis_y") == 0) {
-				y = data[i].getIntValues()[0];
-			} else if(data[i].getChannelInfo().getName().compareTo("axis_y") == 0) {
-				z = data[i].getIntValues()[0];
-			}
-		}
-		
-		// calibration has to be done here
-		// at the moment: fixed values for Sony Ericsson K850i
-		//  -- may work for other devices, too
-		int x0 = -63;
-		int x3 = -1044;
-		int y0 = 45;
-		int y2 = -936;
-		int z0 = 45;
-		int z1 = -936;
-		
-		acc[0] = (double) (x - x0) / (double) (x3 - x0);
-		acc[1] = (double) (y - y0) / (double) (y2 - y0);
-		acc[2] = (double) (z - z0) / (double) (z1 - z0);
-		
-		this.fireAccelerationEvent(acc);		
-	}
-	
-	// TODO:
-	// Button press events should be delegated from current GUI
-	// to the fireButtonPress() methods. I don't know at the moment,
-	// if there exist different value encodings for different mobile
-	// phones.
-	
-	/*
-	 * @author Benjamin 'BePo' Poppinga
-	 * Helper to determine the accelerometer URL
-	 */
-	private String getSensorURL() {
-		SensorInfo[] si = SensorManager.findSensors("acceleration",
-				SensorInfo.CONTEXT_TYPE_USER);
-		return si[0].getUrl();		
-	}
-
-}