diff --git a/src/org/oscim/database/test/MapDatabase.java b/src/org/oscim/database/test/MapDatabase.java
index 898e4f69..43ed6bfb 100644
--- a/src/org/oscim/database/test/MapDatabase.java
+++ b/src/org/oscim/database/test/MapDatabase.java
@@ -34,17 +34,13 @@ import org.oscim.generator.JobTile;
 public class MapDatabase implements IMapDatabase {
 
 	private final static String PROJECTION = "Mercator";
-	//private float[] mCoords = new float[20];
-	//private short[] mIndex = new short[4];
 
 	GeometryBuffer mGeom = new GeometryBuffer(new float[20], new short[4]);
 
 	// private Tag[] mTags = { new Tag("boundary", "administrative"), new
 	// Tag("admin_level", "2") };
 	private final Tag[] mTags = { new Tag("natural", "water") };
-	private final Tag[] mTagsWay = { new Tag("highway", "primary"), new Tag("name", "Highway Rd") };
-
-	// private Tag[] mNameTags;
+	//private final Tag[] mTagsWay = { new Tag("highway", "primary"), new Tag("name", "Highway Rd") };
 
 	private final MapInfo mMapInfo =
 			new MapInfo(new BoundingBox(-180, -90, 180, 90),
diff --git a/src/org/oscim/renderer/GLRenderer.java b/src/org/oscim/renderer/GLRenderer.java
index a769e34d..6fd68e9a 100644
--- a/src/org/oscim/renderer/GLRenderer.java
+++ b/src/org/oscim/renderer/GLRenderer.java
@@ -75,8 +75,6 @@ public class GLRenderer implements GLSurfaceView.Renderer {
 
 	private static float[] mTileCoords;
 
-	private static float[] mDebugCoords;
-
 	public class Matrices {
 		public final Matrix4 viewproj = new Matrix4();
 		public final Matrix4 proj = new Matrix4();
@@ -186,7 +184,6 @@ public class GLRenderer implements GLSurfaceView.Renderer {
 
 		mMatrices = new Matrices();
 		mTileCoords = new float[8];
-		mDebugCoords = new float[8];
 
 		// tile fill coords
 		short min = 0;
diff --git a/src/org/oscim/utils/pool/Inlist.java b/src/org/oscim/utils/pool/Inlist.java
index 016b669d..71fc2d77 100644
--- a/src/org/oscim/utils/pool/Inlist.java
+++ b/src/org/oscim/utils/pool/Inlist.java
@@ -20,14 +20,14 @@ public class Inlist<T extends Inlist<T>> {
 
 	public T next;
 
-	static <T extends Inlist<T>> int size(Inlist<T> list) {
+	static <T extends Inlist<T>> int size(T list) {
 		int count = 0;
 		for (Inlist<T> l = list; l != null; l = l.next)
 			count++;
 		return count;
 	}
 
-	public static <T extends Inlist<T>> Inlist<T> remove(Inlist<T> list, Inlist<T> item) {
+	public static <T extends Inlist<T>> T remove(T list, T item) {
 		if (item == list) {
 			return item.next;
 		}
@@ -44,12 +44,12 @@ public class Inlist<T extends Inlist<T>> {
 	}
 
 
-	static <T extends Inlist<T>> Inlist<T> prepend(T list, T item) {
+	public static <T extends Inlist<T>> T prepend(T list, T item) {
 		item.next = list;
 		return item;
 	}
 
-	static <T extends Inlist<T>> Inlist<T> append(T list, T item) {
+	public static <T extends Inlist<T>> T append(T list, T item) {
 
 		if (debug) {
 			if (item.next != null) {