diff --git a/cli/src/commands/org/jnode/command/common/ExprCommand.java b/cli/src/commands/org/jnode/command/common/ExprCommand.java
index de959f5c7d..20be8ba5e8 100644
--- a/cli/src/commands/org/jnode/command/common/ExprCommand.java
+++ b/cli/src/commands/org/jnode/command/common/ExprCommand.java
@@ -281,7 +281,6 @@ private Object parseSubstr(boolean evaluate) throws ExprException {
     }
 
     private Object parseMatch(boolean evaluate) {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/core/src/classpath/ext/java/util/prefs/TransientPreferences.java b/core/src/classpath/ext/java/util/prefs/TransientPreferences.java
index c0672b2c56..c8204828d7 100644
--- a/core/src/classpath/ext/java/util/prefs/TransientPreferences.java
+++ b/core/src/classpath/ext/java/util/prefs/TransientPreferences.java
@@ -36,7 +36,6 @@ public TransientPreferences() {
      * @see java.util.prefs.AbstractPreferences#childrenNamesSpi()
      */
     protected String[] childrenNamesSpi() throws BackingStoreException {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -44,7 +43,6 @@ protected String[] childrenNamesSpi() throws BackingStoreException {
      * @see java.util.prefs.AbstractPreferences#childSpi(java.lang.String)
      */
     protected AbstractPreferences childSpi(String name) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -52,7 +50,6 @@ protected AbstractPreferences childSpi(String name) {
      * @see java.util.prefs.AbstractPreferences#flushSpi()
      */
     protected void flushSpi() throws BackingStoreException {
-        // TODO Auto-generated method stub
         
     }
 
@@ -60,7 +57,6 @@ protected void flushSpi() throws BackingStoreException {
      * @see java.util.prefs.AbstractPreferences#getSpi(java.lang.String)
      */
     protected String getSpi(String key) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -68,7 +64,6 @@ protected String getSpi(String key) {
      * @see java.util.prefs.AbstractPreferences#keysSpi()
      */
     protected String[] keysSpi() throws BackingStoreException {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -76,7 +71,6 @@ protected String[] keysSpi() throws BackingStoreException {
      * @see java.util.prefs.AbstractPreferences#putSpi(java.lang.String, java.lang.String)
      */
     protected void putSpi(String key, String value) {
-        // TODO Auto-generated method stub
         
     }
 
@@ -84,7 +78,6 @@ protected void putSpi(String key, String value) {
      * @see java.util.prefs.AbstractPreferences#removeNodeSpi()
      */
     protected void removeNodeSpi() throws BackingStoreException {
-        // TODO Auto-generated method stub
         
     }
 
@@ -92,7 +85,6 @@ protected void removeNodeSpi() throws BackingStoreException {
      * @see java.util.prefs.AbstractPreferences#removeSpi(java.lang.String)
      */
     protected void removeSpi(String key) {
-        // TODO Auto-generated method stub
         
     }
 
@@ -100,7 +92,6 @@ protected void removeSpi(String key) {
      * @see java.util.prefs.AbstractPreferences#syncSpi()
      */
     protected void syncSpi() throws BackingStoreException {
-        // TODO Auto-generated method stub
         
     }
     
diff --git a/core/src/core/org/jnode/assembler/x86/X86TextAssembler.java b/core/src/core/org/jnode/assembler/x86/X86TextAssembler.java
index 45a18e2d37..e97786a3e2 100644
--- a/core/src/core/org/jnode/assembler/x86/X86TextAssembler.java
+++ b/core/src/core/org/jnode/assembler/x86/X86TextAssembler.java
@@ -97,7 +97,6 @@ public void setOffset(int offset) {
         }
 
         public void addUnresolvedLink(int offset, int patchSize) {
-            // TODO Auto-generated method stub
 
         }
 
diff --git a/core/src/core/org/jnode/system/repository/plugins/PluginLoaderPlugin.java b/core/src/core/org/jnode/system/repository/plugins/PluginLoaderPlugin.java
index 55042fa100..676fab5926 100644
--- a/core/src/core/org/jnode/system/repository/plugins/PluginLoaderPlugin.java
+++ b/core/src/core/org/jnode/system/repository/plugins/PluginLoaderPlugin.java
@@ -79,7 +79,6 @@ public PluginLoaderPlugin(RepositoryPlugin next) {
     @Override
     protected void providerAdded(SystemRepositoryProvider[] providers,
                                  SystemRepositoryProvider provider) {
-        // TODO Auto-generated method stub
         super.providerAdded(providers, provider);
     }
 
@@ -91,7 +90,6 @@ protected void providerAdded(SystemRepositoryProvider[] providers,
     @Override
     protected void providerRemoved(SystemRepositoryProvider[] providers,
                                    SystemRepositoryProvider provider) {
-        // TODO Auto-generated method stub
         super.providerRemoved(providers, provider);
     }
 
@@ -146,7 +144,6 @@ public ByteBuffer getPluginBuffer(PluginReference pluginReference) {
             for (SystemRepositoryProvider prov : pluginProviders) {
                 //todo empty ?
             }
-            // TODO Auto-generated method stub
             return null;
         }
     }
diff --git a/core/src/core/org/jnode/vm/compiler/ir/quad/PhiAssignQuad.java b/core/src/core/org/jnode/vm/compiler/ir/quad/PhiAssignQuad.java
index 496c15e77b..f5af4516c9 100644
--- a/core/src/core/org/jnode/vm/compiler/ir/quad/PhiAssignQuad.java
+++ b/core/src/core/org/jnode/vm/compiler/ir/quad/PhiAssignQuad.java
@@ -62,7 +62,6 @@ public Operand<T> propagate(Variable<T> operand) {
     }
 
     public int getLHSLiveAddress() {
-        // TODO Auto-generated method stub
         return 0;
     }
 
@@ -93,7 +92,6 @@ public void doPass2() {
     }
 
     public void generateCode(CodeGenerator cg) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/core/src/core/org/jnode/vm/x86/VmX86Processor64.java b/core/src/core/org/jnode/vm/x86/VmX86Processor64.java
index 0df29a0dbe..d9a3c3d585 100644
--- a/core/src/core/org/jnode/vm/x86/VmX86Processor64.java
+++ b/core/src/core/org/jnode/vm/x86/VmX86Processor64.java
@@ -61,17 +61,14 @@ public final VmThread createThread(VmIsolatedStatics isolatedStatics, Thread jav
 
     protected Address setupBootCode(ResourceManager rm, GDT gdt)
         throws ResourceNotFreeException {
-        // TODO Auto-generated method stub
         return null;
     }
 
     protected void setupGDT(GDT gdt) {
-        // TODO Auto-generated method stub
 
     }
 
     protected void setupUserStack(byte[] userStack) {
-        // TODO Auto-generated method stub
 
     }
 }
diff --git a/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerSSE.java b/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerSSE.java
index cb4ccf7db2..db31350a26 100644
--- a/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerSSE.java
+++ b/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerSSE.java
@@ -48,12 +48,10 @@ final void add(int type) {
     }
 
     void compare(boolean gt, int type, Label curInstrLabel) {
-        // TODO Auto-generated method stub
 
     }
 
     void convert(int fromType, int toType) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -62,7 +60,6 @@ final void div(int type) {
     }
 
     void fpaload(int type) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -71,7 +68,6 @@ final void mul(int type) {
     }
 
     void neg(int type) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerSSE.java b/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerSSE.java
index 791fa98986..e22ba85dc5 100644
--- a/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerSSE.java
+++ b/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerSSE.java
@@ -48,12 +48,10 @@ final void add(int type) {
     }
 
     void compare(boolean gt, int type, Label curInstrLabel) {
-        // TODO Auto-generated method stub
 
     }
 
     void convert(int fromType, int toType) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -62,7 +60,6 @@ final void div(int type) {
     }
 
     void fpaload(int type) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -71,7 +68,6 @@ final void mul(int type) {
     }
 
     void neg(int type) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java b/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java
index ff02d0bc83..a47a9a1f9a 100644
--- a/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java
+++ b/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java
@@ -157,7 +157,6 @@ public boolean isSystemPlugin() {
     }
 
     public void removeListener(PluginDescriptorListener listener) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/core/src/mmtk-vm/org/jnode/vm/memmgr/mmtk/BaseMmtkHeapManager.java b/core/src/mmtk-vm/org/jnode/vm/memmgr/mmtk/BaseMmtkHeapManager.java
index 0eb4c24cc5..7b01ad27db 100644
--- a/core/src/mmtk-vm/org/jnode/vm/memmgr/mmtk/BaseMmtkHeapManager.java
+++ b/core/src/mmtk-vm/org/jnode/vm/memmgr/mmtk/BaseMmtkHeapManager.java
@@ -218,7 +218,6 @@ protected void initialize() {
     }
 
     public boolean isLowOnMemory() {
-        // TODO Auto-generated method stub
         return false;
     }
 
diff --git a/core/src/openjdk/vm/sun/font/NativeFontManager.java b/core/src/openjdk/vm/sun/font/NativeFontManager.java
index 6c561649da..4ccff4292a 100644
--- a/core/src/openjdk/vm/sun/font/NativeFontManager.java
+++ b/core/src/openjdk/vm/sun/font/NativeFontManager.java
@@ -82,49 +82,41 @@ FontStrike createStrike(FontStrikeDesc desc) {
 
                     @Override
                     Float getCharMetrics(char ch) {
-                        // TODO Auto-generated method stub
                         return new Float(10, 10);
                     }
 
                     @Override
                     float getCodePointAdvance(int cp) {
-                        // TODO Auto-generated method stub
                         return 0;
                     }
 
                     @Override
                     StrikeMetrics getFontMetrics() {
-                        // TODO Auto-generated method stub
                         return new StrikeMetrics();
                     }
 
                     @Override
                     float getGlyphAdvance(int glyphCode) {
-                        // TODO Auto-generated method stub
                         return 0;
                     }
 
                     @Override
                     void getGlyphImageBounds(int glyphcode, Float pt, Rectangle result) {
-                        // TODO Auto-generated method stub
                         result.setBounds((int) pt.getX(), (int) pt.getY(), 10, 10);
                     }
 
                     @Override
                     long getGlyphImagePtr(int glyphcode) {
-                        // TODO Auto-generated method stub
                         return 0;
                     }
 
                     @Override
                     void getGlyphImagePtrs(int[] glyphCodes, long[] images, int len) {
-                        // TODO Auto-generated method stub
                         
                     }
 
                     @Override
                     Float getGlyphMetrics(int glyphcode) {
-                        // TODO Auto-generated method stub
                         return new Float(10, 10);
                     }
 
@@ -135,13 +127,11 @@ GeneralPath getGlyphOutline(int glyphCode, float x, float y) {
 
                     @Override
                     java.awt.geom.Rectangle2D.Float getGlyphOutlineBounds(int glyphCode) {
-                        // TODO Auto-generated method stub
                         return new java.awt.geom.Rectangle2D.Float(0, 0, 10, 10);
                     }
 
                     @Override
                     GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
-                        // TODO Auto-generated method stub
                         GeneralPath path = getGlyphOutline(glyphs[0], x, y);
                         
                         for(int i = 1; i < glyphs.length; i++) {
@@ -153,7 +143,6 @@ GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
 
                     @Override
                     public int getNumGlyphs() {
-                        // TODO Auto-generated method stub
                         return 0;
                     }
                     
@@ -168,25 +157,21 @@ CharToGlyphMapper getMapper() {
 
                     @Override
                     public void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
-                        // TODO Auto-generated method stub
                         
                     }
 
                     @Override
                     public void charsToGlyphs(int count, int[] unicodes, int[] glyphs) {
-                        // TODO Auto-generated method stub
                         
                     }
 
                     @Override
                     public boolean charsToGlyphsNS(int count, char[] unicodes, int[] glyphs) {
-                        // TODO Auto-generated method stub
                         return false;
                     }
 
                     @Override
                     public int getNumGlyphs() {
-                        // TODO Auto-generated method stub
                         return 0;
                     }
                     
diff --git a/core/src/test/org/jnode/test/InstanceofTest.java b/core/src/test/org/jnode/test/InstanceofTest.java
index f1d7a05d07..c5814b8c1a 100644
--- a/core/src/test/org/jnode/test/InstanceofTest.java
+++ b/core/src/test/org/jnode/test/InstanceofTest.java
@@ -36,7 +36,6 @@ public static void main(String[] args) {
                 }
             }
         }
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/core/src/test/org/jnode/test/core/ProxyTest.java b/core/src/test/org/jnode/test/core/ProxyTest.java
index 4ee65a7eb4..9b15d64556 100644
--- a/core/src/test/org/jnode/test/core/ProxyTest.java
+++ b/core/src/test/org/jnode/test/core/ProxyTest.java
@@ -58,7 +58,6 @@ public static void main(String[] args) throws IOException {
      */
     public Object invoke(Object proxy, Method method, Object[] args)
         throws Throwable {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/core/src/test/org/jtestserver/tests/TestInputMessage.java b/core/src/test/org/jtestserver/tests/TestInputMessage.java
index f25b985977..997ba9cd03 100644
--- a/core/src/test/org/jtestserver/tests/TestInputMessage.java
+++ b/core/src/test/org/jtestserver/tests/TestInputMessage.java
@@ -57,7 +57,6 @@ public void sendMessage(Object socket, String command, SocketAddress remoteAddre
         @Override
         public Client<Object, ? extends Protocol<Object>> createClient(InetAddress serverIp,
                 int serverPort) throws ProtocolException {
-            // TODO Auto-generated method stub
             return null;
         }
 
@@ -67,7 +66,6 @@ public void sendMessage(Object socket, String command, SocketAddress remoteAddre
         @Override
         public Server<Object, ? extends Protocol<Object>> createServer(int localPort)
             throws ProtocolException {
-            // TODO Auto-generated method stub
             return null;
         }
         
diff --git a/distr/src/apps/org/jnode/apps/jpartition/commands/FormatPartitionCommand.java b/distr/src/apps/org/jnode/apps/jpartition/commands/FormatPartitionCommand.java
index ff5ffaa1f7..412ea6e16c 100644
--- a/distr/src/apps/org/jnode/apps/jpartition/commands/FormatPartitionCommand.java
+++ b/distr/src/apps/org/jnode/apps/jpartition/commands/FormatPartitionCommand.java
@@ -51,7 +51,6 @@ public FormatPartitionCommand(IDEDevice device, int partitionNumber,
      */
     @Override
     protected final void doExecute(Context context) throws CommandException {
-        // TODO Auto-generated method stub
     }
 
     /**
diff --git a/distr/src/apps/org/jnode/apps/jpartition/commands/RemovePartitionCommand.java b/distr/src/apps/org/jnode/apps/jpartition/commands/RemovePartitionCommand.java
index bc9df172f8..45ff5bbe3c 100644
--- a/distr/src/apps/org/jnode/apps/jpartition/commands/RemovePartitionCommand.java
+++ b/distr/src/apps/org/jnode/apps/jpartition/commands/RemovePartitionCommand.java
@@ -45,7 +45,6 @@ public RemovePartitionCommand(IDEDevice device, int partitionNumber) {
      */
     @Override
     protected final void doExecute(Context context) throws CommandException {
-        // TODO Auto-generated method stub
     }
 
     /**
diff --git a/distr/src/apps/org/jnode/apps/telnetd/RemoteTextScreen.java b/distr/src/apps/org/jnode/apps/telnetd/RemoteTextScreen.java
index 9bc451f6aa..4a15512633 100644
--- a/distr/src/apps/org/jnode/apps/telnetd/RemoteTextScreen.java
+++ b/distr/src/apps/org/jnode/apps/telnetd/RemoteTextScreen.java
@@ -84,7 +84,6 @@ public void copyContent(int srcOffset, int destOffset, int length) {
      * {@inheritDoc}
      */
     public void copyTo(TextScreen dst, int offset, int length) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDriver.java b/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDriver.java
index 968cabf13c..2e6b35398d 100755
--- a/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDriver.java
+++ b/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDriver.java
@@ -108,7 +108,6 @@ public int getSectorSize() throws IOException {
     }
 
     public PartitionTableEntry getPartitionTableEntry() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -126,22 +125,18 @@ public void read(long devOffset, ByteBuffer dest) throws IOException {
     }
 
     public void write(long devOffset, ByteBuffer src) throws IOException {
-        // TODO Auto-generated method stub
 
     }
 
     public void flush() throws IOException {
-        // TODO Auto-generated method stub
 
     }
 
     public void requestCompleted(USBRequest request) {
-        // TODO Auto-generated method stub
 
     }
 
     public void requestFailed(USBRequest request) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -205,7 +200,6 @@ public boolean canEject() {
     }
 
     public void lock() throws IOException {
-        // TODO Auto-generated method stub
 
     }
 
@@ -214,7 +208,6 @@ public boolean isLocked() {
     }
 
     public void eject() throws IOException {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBRead10.java b/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBRead10.java
index 9c56ce2f35..e65bafe6b0 100644
--- a/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBRead10.java
+++ b/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBRead10.java
@@ -45,7 +45,6 @@ public CDBRead10(int lba, int nrBlocks) {
 
     @Override
     public int getDataTransfertCount() {
-        // TODO Auto-generated method stub
         return 0;
     }
 
diff --git a/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBReadCapacity.java b/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBReadCapacity.java
index 1f183511d3..276fee9c22 100644
--- a/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBReadCapacity.java
+++ b/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBReadCapacity.java
@@ -39,7 +39,6 @@ public CDBReadCapacity() {
 
     @Override
     public int getDataTransfertCount() {
-        // TODO Auto-generated method stub
         return 0;
     }
 
diff --git a/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBStartStopUnit.java b/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBStartStopUnit.java
index 52fdcd8832..54a9be92a8 100644
--- a/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBStartStopUnit.java
+++ b/fs/src/driver/org/jnode/driver/bus/scsi/cdb/mmc/CDBStartStopUnit.java
@@ -94,7 +94,6 @@ final int getCode() {
 
     @Override
     public int getDataTransfertCount() {
-        // TODO Auto-generated method stub
         return 0;
     }
 
diff --git a/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java b/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java
index f0c451604b..830a934a0c 100644
--- a/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java
+++ b/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java
@@ -174,7 +174,6 @@ public FatDirectory getRootDir() {
      */
     protected FSFile createFile(FSEntry entry) throws IOException {
 
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -182,7 +181,6 @@ protected FSFile createFile(FSEntry entry) throws IOException {
      *
      */
     protected FSDirectory createDirectory(FSEntry entry) throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -190,7 +188,6 @@ protected FSDirectory createDirectory(FSEntry entry) throws IOException {
      *
      */
     protected FatRootEntry createRootEntry() throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java b/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java
index 6a88e5f960..75298b498a 100644
--- a/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java
+++ b/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java
@@ -283,7 +283,6 @@ public CatalogFolder getHardLinkFolder() {
     }
 
     private void writeEntries(final FSEntryTable entries) throws IOException {
-        // TODO Auto-generated method stub
     }
 
     /**
diff --git a/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFile.java b/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFile.java
index 5aba39eda1..a02c38b82b 100644
--- a/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFile.java
+++ b/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFile.java
@@ -77,7 +77,6 @@ public final long getLength() {
 
     @Override
     public void setLength(final long length) throws IOException {
-        // TODO Auto-generated method stub
     }
 
     @Override
@@ -95,7 +94,6 @@ public final void read(final long fileOffset, final ByteBuffer dest) throws IOEx
 
     @Override
     public void write(final long fileOffset, final ByteBuffer src) throws IOException {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java b/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java
index 2ba32fa995..04e109c643 100644
--- a/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java
+++ b/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java
@@ -85,7 +85,6 @@ public void flush() throws IOException {
      *
      */
     protected FSFile createFile(FSEntry entry) throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -93,7 +92,6 @@ protected FSFile createFile(FSEntry entry) throws IOException {
      *
      */
     protected FSDirectory createDirectory(FSEntry entry) throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -101,7 +99,6 @@ protected FSDirectory createDirectory(FSEntry entry) throws IOException {
      *
      */
     protected ISO9660Entry createRootEntry() throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/fs/src/fs/org/jnode/fs/jarfs/JarFSEntry.java b/fs/src/fs/org/jnode/fs/jarfs/JarFSEntry.java
index a3cf211deb..a5fc01290e 100644
--- a/fs/src/fs/org/jnode/fs/jarfs/JarFSEntry.java
+++ b/fs/src/fs/org/jnode/fs/jarfs/JarFSEntry.java
@@ -67,7 +67,6 @@ public String getName() {
     }
 
     public FSDirectory getParent() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -92,17 +91,14 @@ public void setLastModified(long lastModified) throws IOException {
     }
 
     public FSFile getFile() throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
     public FSDirectory getDirectory() throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
     public FSAccessRights getAccessRights() throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2AccessRights.java b/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2AccessRights.java
index fdb23caa6e..0d551f7574 100644
--- a/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2AccessRights.java
+++ b/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2AccessRights.java
@@ -42,32 +42,26 @@ public boolean canExecute() {
     }
 
     public boolean canRead() {
-        // TODO Auto-generated method stub
         return false;
     }
 
     public boolean canWrite() {
-        // TODO Auto-generated method stub
         return false;
     }
 
     public Principal getOwner() throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
     public boolean setExecutable(boolean enable, boolean owneronly) {
-        // TODO Auto-generated method stub
         return false;
     }
 
     public boolean setReadable(boolean enable, boolean owneronly) {
-        // TODO Auto-generated method stub
         return false;
     }
 
     public boolean setWritable(boolean enable, boolean owneronly) {
-        // TODO Auto-generated method stub
         return false;
     }
 
diff --git a/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Directory.java b/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Directory.java
index 910dbac5d3..fe37fca4f7 100644
--- a/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Directory.java
+++ b/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2Directory.java
@@ -274,7 +274,6 @@ public FSEntry addFile(String name) throws IOException {
     }
 
     public void flush() throws IOException {
-        // TODO Auto-generated method stub
     }
 
     public void remove(String name) throws IOException {
diff --git a/fs/src/fs/org/jnode/fs/ntfs/NTFSEntry.java b/fs/src/fs/org/jnode/fs/ntfs/NTFSEntry.java
index e63eca588a..1d905c37b9 100644
--- a/fs/src/fs/org/jnode/fs/ntfs/NTFSEntry.java
+++ b/fs/src/fs/org/jnode/fs/ntfs/NTFSEntry.java
@@ -156,7 +156,6 @@ public String getName() {
      * @see org.jnode.fs.FSEntry#getParent()
      */
     public FSDirectory getParent() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -222,7 +221,6 @@ public boolean isDirectory() {
      * @see org.jnode.fs.FSEntry#setName(java.lang.String)
      */
     public void setName(String newName) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -278,7 +276,6 @@ public FSDirectory getDirectory() throws IOException {
      * @see org.jnode.fs.FSEntry#getAccessRights()
      */
     public FSAccessRights getAccessRights() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -286,7 +283,6 @@ public FSAccessRights getAccessRights() {
      * @see org.jnode.fs.FSObject#isValid()
      */
     public boolean isValid() {
-        // TODO Auto-generated method stub
         return true;
     }
 
diff --git a/fs/src/fs/org/jnode/fs/ntfs/NTFSFile.java b/fs/src/fs/org/jnode/fs/ntfs/NTFSFile.java
index ccec47439d..5f5b558053 100644
--- a/fs/src/fs/org/jnode/fs/ntfs/NTFSFile.java
+++ b/fs/src/fs/org/jnode/fs/ntfs/NTFSFile.java
@@ -95,7 +95,6 @@ public long getLength() {
      * @see org.jnode.fs.FSFile#setLength(long)
      */
     public void setLength(long length) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -118,7 +117,6 @@ public void read(long fileOffset, ByteBuffer destBuf) throws IOException {
      */
     // public void write(long fileOffset, byte[] src, int off, int len) {
     public void write(long fileOffset, ByteBuffer src) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java b/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java
index 214c843e0c..eaa7453b8c 100644
--- a/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java
+++ b/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java
@@ -126,14 +126,12 @@ public byte[] getVolumeId() throws IOException {
      * Flush all data.
      */
     public void flush() throws IOException {
-        // TODO Auto-generated method stub
     }
 
     /**
      *
      */
     protected FSFile createFile(FSEntry entry) throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -141,7 +139,6 @@ protected FSFile createFile(FSEntry entry) throws IOException {
      *
      */
     protected FSDirectory createDirectory(FSEntry entry) throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -149,7 +146,6 @@ protected FSDirectory createDirectory(FSEntry entry) throws IOException {
      *
      */
     protected NTFSEntry createRootEntry() throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/fs/src/fs/org/jnode/fs/service/def/FileHandleImpl.java b/fs/src/fs/org/jnode/fs/service/def/FileHandleImpl.java
index ce1471fdea..2522c7b871 100644
--- a/fs/src/fs/org/jnode/fs/service/def/FileHandleImpl.java
+++ b/fs/src/fs/org/jnode/fs/service/def/FileHandleImpl.java
@@ -239,7 +239,6 @@ public int available() {
     }
 
     public void unlock(long pos, long len) {
-        // TODO Auto-generated method stub
     }
 
     public int read() throws IOException {
@@ -260,12 +259,10 @@ public void write(int b) throws IOException {
     }
 
     public boolean lock() {
-        // TODO Auto-generated method stub
         return true;
     }
 
     public MappedByteBuffer mapImpl(char mode, long position, int size) {
-        // TODO Auto-generated method stub
         return null;
     }
 }
diff --git a/fs/src/fs/org/jnode/fs/service/def/VirtualDirEntry.java b/fs/src/fs/org/jnode/fs/service/def/VirtualDirEntry.java
index bd044e866b..dc2a850c62 100644
--- a/fs/src/fs/org/jnode/fs/service/def/VirtualDirEntry.java
+++ b/fs/src/fs/org/jnode/fs/service/def/VirtualDirEntry.java
@@ -97,7 +97,6 @@ final class VirtualDirEntry implements FSEntry, FSDirectory, FSEntryCreated, FSE
      * @see org.jnode.fs.FSEntry#getAccessRights()
      */
     public FSAccessRights getAccessRights() throws IOException {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java b/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java
index 46a991bde7..98c4290fe3 100644
--- a/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java
+++ b/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java
@@ -56,7 +56,6 @@ public final FileSystemType<FileSystem<VirtualDirEntry>> getType() {
      * @see org.jnode.fs.FileSystem#close()
      */
     public void close() throws IOException {
-        // TODO Auto-generated method stub
     }
 
     /**
diff --git a/fs/src/test/org/jnode/test/fs/driver/context/IDEDiskPartitionDriverContext.java b/fs/src/test/org/jnode/test/fs/driver/context/IDEDiskPartitionDriverContext.java
index 193e94ab25..2b3c702ced 100644
--- a/fs/src/test/org/jnode/test/fs/driver/context/IDEDiskPartitionDriverContext.java
+++ b/fs/src/test/org/jnode/test/fs/driver/context/IDEDiskPartitionDriverContext.java
@@ -32,7 +32,6 @@ public IDEDiskPartitionDriverContext() {
     public void init(TestConfig config, MockObjectTestCase testCase) throws Exception {
         super.init(config, testCase);
 
-        // TODO Auto-generated method stub
 
     }
 //  TODO: create context
diff --git a/gui/src/awt/org/jnode/awt/JNodeGraphics.java b/gui/src/awt/org/jnode/awt/JNodeGraphics.java
index ee2e0e5427..7721438e9f 100644
--- a/gui/src/awt/org/jnode/awt/JNodeGraphics.java
+++ b/gui/src/awt/org/jnode/awt/JNodeGraphics.java
@@ -85,7 +85,6 @@ public FontMetrics getFontMetrics(Font font) {
      * @see java.awt.Graphics2D#getDeviceConfiguration()
      */
     public GraphicsConfiguration getDeviceConfiguration() {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/gui/src/awt/org/jnode/awt/JNodeGraphicsConfiguration.java b/gui/src/awt/org/jnode/awt/JNodeGraphicsConfiguration.java
index 925c880172..d69a87fc80 100644
--- a/gui/src/awt/org/jnode/awt/JNodeGraphicsConfiguration.java
+++ b/gui/src/awt/org/jnode/awt/JNodeGraphicsConfiguration.java
@@ -64,7 +64,6 @@ public BufferedImage createCompatibleImage(int w, int h) {
      * @see java.awt.GraphicsConfiguration#createCompatibleVolatileImage(int, int)
      */
     public VolatileImage createCompatibleVolatileImage(int w, int h) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -96,7 +95,6 @@ public ColorModel getColorModel(int transparency) {
      * @see java.awt.GraphicsConfiguration#getDefaultTransform()
      */
     public AffineTransform getDefaultTransform() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -111,7 +109,6 @@ public GraphicsDevice getDevice() {
      * @see java.awt.GraphicsConfiguration#getNormalizingTransform()
      */
     public AffineTransform getNormalizingTransform() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -128,7 +125,6 @@ public String toString() {
 
     @Override
     public VolatileImage createCompatibleVolatileImage(int width, int height, int transparency) {
-        // TODO Auto-generated method stub
         return null;
     }
 }
diff --git a/gui/src/awt/org/jnode/awt/JNodeSurfaceGraphics2D.java b/gui/src/awt/org/jnode/awt/JNodeSurfaceGraphics2D.java
index e554d9642a..d0de14e30e 100644
--- a/gui/src/awt/org/jnode/awt/JNodeSurfaceGraphics2D.java
+++ b/gui/src/awt/org/jnode/awt/JNodeSurfaceGraphics2D.java
@@ -86,7 +86,6 @@ public FontMetrics getFontMetrics(Font font) {
      * @see java.awt.Graphics2D#getDeviceConfiguration()
      */
     public GraphicsConfiguration getDeviceConfiguration() {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/gui/src/awt/org/jnode/awt/JNodeToolkit.java b/gui/src/awt/org/jnode/awt/JNodeToolkit.java
index 5bdca16a7b..9f5060bb20 100644
--- a/gui/src/awt/org/jnode/awt/JNodeToolkit.java
+++ b/gui/src/awt/org/jnode/awt/JNodeToolkit.java
@@ -151,7 +151,6 @@ public JNodeToolkit() {
      */
     @Override
     public EmbeddedWindowPeer createEmbeddedWindow(EmbeddedWindow w) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -581,7 +580,6 @@ public GraphicsEnvironment getLocalGraphicsEnvironment() {
      *      java.util.Properties)
      */
     public PrintJob getPrintJob(Frame frame, String title, Properties props) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -590,7 +588,6 @@ public PrintJob getPrintJob(Frame frame, String title, Properties props) {
      * @see java.awt.Toolkit#getScreenResolution()
      */
     public int getScreenResolution() {
-        // TODO Auto-generated method stub
         return 0;
     }
 
@@ -988,7 +985,6 @@ public void iterateNativeQueue(EventQueue locked, boolean block) {
      */
     @SuppressWarnings("unchecked")
     public Map mapInputMethodHighlight(InputMethodHighlight highlight) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -1026,7 +1022,6 @@ protected void setTop(Frame frame) {
      * @see java.awt.Toolkit#sync()
      */
     public void sync() {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/gui/src/awt/org/jnode/awt/font/truetype/TTFFontPeer.java b/gui/src/awt/org/jnode/awt/font/truetype/TTFFontPeer.java
index 5a59a428b6..e184040f9b 100644
--- a/gui/src/awt/org/jnode/awt/font/truetype/TTFFontPeer.java
+++ b/gui/src/awt/org/jnode/awt/font/truetype/TTFFontPeer.java
@@ -128,7 +128,6 @@ public int getMissingGlyphCode(Font font) {
 
     @Override
     public int getNumGlyphs(Font font) {
-        // TODO Auto-generated method stub
         return 0;
     }
 
diff --git a/gui/src/awt/org/jnode/awt/font/truetype/TTFPlugin.java b/gui/src/awt/org/jnode/awt/font/truetype/TTFPlugin.java
index 90d53a5430..13e7a5dae0 100644
--- a/gui/src/awt/org/jnode/awt/font/truetype/TTFPlugin.java
+++ b/gui/src/awt/org/jnode/awt/font/truetype/TTFPlugin.java
@@ -42,7 +42,6 @@ public TTFPlugin(PluginDescriptor descriptor) {
      * @throws PluginException
      */
     protected void startPlugin() throws PluginException {
-        // TODO Auto-generated method stub
 
     }
 
@@ -52,7 +51,6 @@ protected void startPlugin() throws PluginException {
      * @throws PluginException
      */
     protected void stopPlugin() throws PluginException {
-        // TODO Auto-generated method stub
 
     }
 }
diff --git a/gui/src/awt/org/jnode/awt/image/BufferedImageGraphics2D.java b/gui/src/awt/org/jnode/awt/image/BufferedImageGraphics2D.java
index 51be7a5cd0..d43ad77026 100644
--- a/gui/src/awt/org/jnode/awt/image/BufferedImageGraphics2D.java
+++ b/gui/src/awt/org/jnode/awt/image/BufferedImageGraphics2D.java
@@ -64,7 +64,6 @@ public Graphics create() {
      * @see java.awt.Graphics2D#getDeviceConfiguration()
      */
     public GraphicsConfiguration getDeviceConfiguration() {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/gui/src/awt/org/jnode/awt/image/ImageConsumerByte.java b/gui/src/awt/org/jnode/awt/image/ImageConsumerByte.java
index 2007b7b31b..5d4d684928 100644
--- a/gui/src/awt/org/jnode/awt/image/ImageConsumerByte.java
+++ b/gui/src/awt/org/jnode/awt/image/ImageConsumerByte.java
@@ -69,7 +69,6 @@ public ImageConsumerByte(MemoryResource target, int targetW, int targetH, int de
      * @see java.awt.image.ImageConsumer#setPixels(int, int, int, int, java.awt.image.ColorModel, byte[], int, int)
      */
     public void setPixels(int x, int y, int w, int h, ColorModel model, byte[] pixels, int offset, int scansize) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -85,7 +84,6 @@ public void setPixels(int x, int y, int w, int h, ColorModel model, byte[] pixel
      * @see java.awt.image.ImageConsumer#setPixels(int, int, int, int, java.awt.image.ColorModel, int[], int, int)
      */
     public void setPixels(int x, int y, int w, int h, ColorModel model, int[] pixels, int offset, int scansize) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics.java b/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics.java
index a6b63b90b5..d5b6d5fe93 100644
--- a/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics.java
+++ b/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics.java
@@ -64,7 +64,6 @@ public Graphics create() {
      * @see java.awt.Graphics2D#getDeviceConfiguration()
      */
     public GraphicsConfiguration getDeviceConfiguration() {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics2D.java b/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics2D.java
index 55d3a3c7d0..bc961bd721 100644
--- a/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics2D.java
+++ b/gui/src/awt/org/jnode/awt/image/JNodeBufferedImageGraphics2D.java
@@ -77,7 +77,6 @@ public final Object clone() {
      * @see java.awt.Graphics2D#getDeviceConfiguration()
      */
     public GraphicsConfiguration getDeviceConfiguration() {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/gui/src/awt/org/jnode/awt/image/JNodeImage.java b/gui/src/awt/org/jnode/awt/image/JNodeImage.java
index bae8ea4c7a..d73c5604ea 100644
--- a/gui/src/awt/org/jnode/awt/image/JNodeImage.java
+++ b/gui/src/awt/org/jnode/awt/image/JNodeImage.java
@@ -83,7 +83,6 @@ public JNodeImage(ImageProducer producer) {
      * @see java.awt.Image#flush()
      */
     public void flush() {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/gui/src/awt/org/jnode/awt/image/JNodeImageGraphics.java b/gui/src/awt/org/jnode/awt/image/JNodeImageGraphics.java
index 0017913180..7f89d1f0c0 100644
--- a/gui/src/awt/org/jnode/awt/image/JNodeImageGraphics.java
+++ b/gui/src/awt/org/jnode/awt/image/JNodeImageGraphics.java
@@ -58,7 +58,6 @@ public JNodeImageGraphics(int width, int height) {
      * @see java.awt.Graphics#copyArea(int, int, int, int, int, int)
      */
     public void copyArea(int x, int y, int width, int height, int dx, int dy) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -75,7 +74,6 @@ public Graphics create() {
      * @see java.awt.Graphics2D#draw(java.awt.Shape)
      */
     public void draw(Shape shape) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -84,7 +82,6 @@ public void draw(Shape shape) {
      * @see java.awt.Graphics2D#fill(java.awt.Shape)
      */
     public void fill(Shape shape) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -93,7 +90,6 @@ public void fill(Shape shape) {
      * @see java.awt.Graphics2D#getDeviceConfiguration()
      */
     public GraphicsConfiguration getDeviceConfiguration() {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/gui/src/awt/org/jnode/awt/swingpeers/DesktopFrame.java b/gui/src/awt/org/jnode/awt/swingpeers/DesktopFrame.java
index d59c6308f2..50212f5440 100644
--- a/gui/src/awt/org/jnode/awt/swingpeers/DesktopFrame.java
+++ b/gui/src/awt/org/jnode/awt/swingpeers/DesktopFrame.java
@@ -55,7 +55,6 @@ public final class DesktopFrame extends JFrame implements JNodeAwtContext {
      */
     @Override
     public void repaint(long tm, int x, int y, int width, int height) {
-        // TODO Auto-generated method stub
         //log.info("repaint (" + tm + ", " + x + ", " + y + ", " + width + ", "
         //      + height);
         super.repaint(tm, x, y, width, height);
diff --git a/gui/src/awt/org/jnode/awt/swingpeers/DesktopFramePeer.java b/gui/src/awt/org/jnode/awt/swingpeers/DesktopFramePeer.java
index b381e87eaa..d56802bc83 100644
--- a/gui/src/awt/org/jnode/awt/swingpeers/DesktopFramePeer.java
+++ b/gui/src/awt/org/jnode/awt/swingpeers/DesktopFramePeer.java
@@ -87,7 +87,6 @@ public DesktopFramePeer(SwingToolkit toolkit, DesktopFrame frame) {
      * @see java.awt.peer.FramePeer#getState()
      */
     public int getState() {
-        // TODO Auto-generated method stub
         return 0;
     }
 
@@ -95,7 +94,6 @@ public int getState() {
      * @see java.awt.peer.FramePeer#setIconImage(java.awt.Image)
      */
     public void setIconImage(Image image) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -116,7 +114,6 @@ public void setMenuBar(MenuBar mb) {
      * @see java.awt.peer.FramePeer#setResizable(boolean)
      */
     public void setResizable(boolean resizable) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -124,7 +121,6 @@ public void setResizable(boolean resizable) {
      * @see java.awt.peer.FramePeer#setState(int)
      */
     public void setState(int state) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -132,7 +128,6 @@ public void setState(int state) {
      * @see java.awt.peer.FramePeer#setTitle(java.lang.String)
      */
     public void setTitle(String title) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -140,7 +135,6 @@ public void setTitle(String title) {
      * @see java.awt.peer.WindowPeer#toBack()
      */
     public void toBack() {
-        // TODO Auto-generated method stub
 
     }
 
@@ -148,7 +142,6 @@ public void toBack() {
      * @see java.awt.peer.WindowPeer#toFront()
      */
     public void toFront() {
-        // TODO Auto-generated method stub
 
     }
 
@@ -156,7 +149,6 @@ public void toFront() {
      * @see java.awt.peer.ContainerPeer#beginLayout()
      */
     public void beginLayout() {
-        // TODO Auto-generated method stub
 
     }
 
@@ -164,7 +156,6 @@ public void beginLayout() {
      * @see java.awt.peer.ContainerPeer#beginValidate()
      */
     public void beginValidate() {
-        // TODO Auto-generated method stub
 
     }
 
@@ -172,7 +163,6 @@ public void beginValidate() {
      * @see java.awt.peer.ContainerPeer#endLayout()
      */
     public void endLayout() {
-        // TODO Auto-generated method stub
 
     }
 
@@ -180,7 +170,6 @@ public void endLayout() {
      * @see java.awt.peer.ContainerPeer#endValidate()
      */
     public void endValidate() {
-        // TODO Auto-generated method stub
 
     }
 
@@ -205,7 +194,6 @@ public Insets insets() {
      * @see java.awt.peer.ContainerPeer#isPaintPending()
      */
     public boolean isPaintPending() {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -213,7 +201,6 @@ public boolean isPaintPending() {
      * @see java.awt.peer.ComponentPeer#canDetermineObscurity()
      */
     public boolean canDetermineObscurity() {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -229,7 +216,6 @@ public int checkImage(Image img, int width, int height, ImageObserver ob) {
      * @see java.awt.peer.ComponentPeer#coalescePaintEvent(java.awt.event.PaintEvent)
      */
     public void coalescePaintEvent(PaintEvent e) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -239,7 +225,6 @@ public void coalescePaintEvent(PaintEvent e) {
      */
     public void createBuffers(int x, BufferCapabilities capabilities)
         throws AWTException {
-        // TODO Auto-generated method stub
 
     }
 
@@ -288,7 +273,6 @@ public void enable() {
      * @see java.awt.peer.ComponentPeer#flip(java.awt.BufferCapabilities.FlipContents)
      */
     public void flip(FlipContents contents) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -296,7 +280,6 @@ public void flip(FlipContents contents) {
      * @see java.awt.peer.ComponentPeer#getBackBuffer()
      */
     public Image getBackBuffer() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -390,7 +373,6 @@ public void handleEvent(AWTEvent event) {
      * @see java.awt.peer.ComponentPeer#handlesWheelScrolling()
      */
     public boolean handlesWheelScrolling() {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -412,7 +394,6 @@ public boolean isFocusable() {
      * @see java.awt.peer.ComponentPeer#isObscured()
      */
     public boolean isObscured() {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -428,7 +409,6 @@ public Dimension minimumSize() {
      */
     public void paint(Graphics graphics) {
         log.debug("Paint");
-        // TODO Auto-generated method stub
 
     }
 
@@ -452,7 +432,6 @@ public boolean prepareImage(Image img, int width, int height,
      * @see java.awt.peer.ComponentPeer#print(java.awt.Graphics)
      */
     public void print(Graphics graphics) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -491,7 +470,6 @@ public boolean requestFocus(Component source, boolean bool1, boolean bool2,
      * @see java.awt.peer.ComponentPeer#reshape(int, int, int, int)
      */
     public void reshape(int x, int y, int width, int height) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -499,7 +477,6 @@ public void reshape(int x, int y, int width, int height) {
      * @see java.awt.peer.ComponentPeer#setBackground(java.awt.Color)
      */
     public void setBackground(Color color) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -507,7 +484,6 @@ public void setBackground(Color color) {
      * @see java.awt.peer.ComponentPeer#setBounds(int, int, int, int)
      */
     public void setBounds(int x, int y, int width, int height) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -515,7 +491,6 @@ public void setBounds(int x, int y, int width, int height) {
      * @see java.awt.peer.ComponentPeer#setCursor(java.awt.Cursor)
      */
     public void setCursor(Cursor cursor) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -523,7 +498,6 @@ public void setCursor(Cursor cursor) {
      * @see java.awt.peer.ComponentPeer#setEnabled(boolean)
      */
     public void setEnabled(boolean enabled) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -531,7 +505,6 @@ public void setEnabled(boolean enabled) {
      * @see java.awt.peer.ComponentPeer#setEventMask(long)
      */
     public void setEventMask(long mask) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -539,7 +512,6 @@ public void setEventMask(long mask) {
      * @see java.awt.peer.ComponentPeer#setFont(java.awt.Font)
      */
     public void setFont(Font font) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -547,7 +519,6 @@ public void setFont(Font font) {
      * @see java.awt.peer.ComponentPeer#setForeground(java.awt.Color)
      */
     public void setForeground(Color color) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -571,7 +542,6 @@ public final void show() {
      * @see java.awt.peer.ComponentPeer#updateCursorImmediately()
      */
     public void updateCursorImmediately() {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/gui/src/awt/org/jnode/awt/swingpeers/SwingScrollPanePeer.java b/gui/src/awt/org/jnode/awt/swingpeers/SwingScrollPanePeer.java
index aef39c0327..8272b7f948 100644
--- a/gui/src/awt/org/jnode/awt/swingpeers/SwingScrollPanePeer.java
+++ b/gui/src/awt/org/jnode/awt/swingpeers/SwingScrollPanePeer.java
@@ -49,7 +49,6 @@ public SwingScrollPanePeer(SwingToolkit toolkit, ScrollPane scrollPane) {
      * @see java.awt.peer.ScrollPanePeer#childResized(int, int)
      */
     public void childResized(int width, int height) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -57,7 +56,6 @@ public void childResized(int width, int height) {
      * @see java.awt.peer.ScrollPanePeer#getHScrollbarHeight()
      */
     public int getHScrollbarHeight() {
-        // TODO Auto-generated method stub
         return 0;
     }
 
@@ -65,7 +63,6 @@ public int getHScrollbarHeight() {
      * @see java.awt.peer.ScrollPanePeer#getVScrollbarWidth()
      */
     public int getVScrollbarWidth() {
-        // TODO Auto-generated method stub
         return 0;
     }
 
@@ -73,7 +70,6 @@ public int getVScrollbarWidth() {
      * @see java.awt.peer.ScrollPanePeer#setScrollPosition(int, int)
      */
     public void setScrollPosition(int h, int v) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -82,7 +78,6 @@ public void setScrollPosition(int h, int v) {
      *      int)
      */
     public void setUnitIncrement(Adjustable item, int inc) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -90,7 +85,6 @@ public void setUnitIncrement(Adjustable item, int inc) {
      * @see java.awt.peer.ScrollPanePeer#setValue(java.awt.Adjustable, int)
      */
     public void setValue(Adjustable item, int value) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/gui/src/awt/org/jnode/awt/swingpeers/SwingTextComponentPeer.java b/gui/src/awt/org/jnode/awt/swingpeers/SwingTextComponentPeer.java
index 78851c3f17..e12fd41c79 100644
--- a/gui/src/awt/org/jnode/awt/swingpeers/SwingTextComponentPeer.java
+++ b/gui/src/awt/org/jnode/awt/swingpeers/SwingTextComponentPeer.java
@@ -46,7 +46,6 @@ public SwingTextComponentPeer(SwingToolkit toolkit,
      * @see java.awt.peer.TextComponentPeer#filterEvents(long)
      */
     public long filterEvents(long filter) {
-        // TODO Auto-generated method stub
         return 0;
     }
 
@@ -69,7 +68,6 @@ public Rectangle getCharacterBounds(int pos) {
      * @see java.awt.peer.TextComponentPeer#getIndexAtPoint(int, int)
      */
     public int getIndexAtPoint(int x, int y) {
-        // TODO Auto-generated method stub
         return 0;
     }
 
diff --git a/gui/src/awt/org/jnode/awt/swingpeers/SwingTextFieldPeer.java b/gui/src/awt/org/jnode/awt/swingpeers/SwingTextFieldPeer.java
index 68514a7868..a8f814978c 100644
--- a/gui/src/awt/org/jnode/awt/swingpeers/SwingTextFieldPeer.java
+++ b/gui/src/awt/org/jnode/awt/swingpeers/SwingTextFieldPeer.java
@@ -84,7 +84,6 @@ public void setEchoChar(char echo_char) {
      * @see java.awt.peer.TextFieldPeer#setEchoCharacter(char)
      */
     public void setEchoCharacter(char echo_char) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/gui/src/awt/org/jnode/awt/util/AbstractGraphics.java b/gui/src/awt/org/jnode/awt/util/AbstractGraphics.java
index 96815dc1bd..0d18bc7923 100644
--- a/gui/src/awt/org/jnode/awt/util/AbstractGraphics.java
+++ b/gui/src/awt/org/jnode/awt/util/AbstractGraphics.java
@@ -112,7 +112,6 @@ public AbstractGraphics(AbstractGraphics src) {
      * @see java.awt.Graphics2D#addRenderingHints(java.util.Map)
      */
     public void addRenderingHints(Map<?, ?> hints) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -153,7 +152,6 @@ public void drawImage(BufferedImage image, BufferedImageOp op, int x, int y) {
      */
     public boolean drawImage(Image image, AffineTransform xform,
                              ImageObserver obs) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -164,7 +162,6 @@ public boolean drawImage(Image image, AffineTransform xform,
      *      java.awt.geom.AffineTransform)
      */
     public void drawRenderableImage(RenderableImage image, AffineTransform xform) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -175,7 +172,6 @@ public void drawRenderableImage(RenderableImage image, AffineTransform xform) {
      *      java.awt.geom.AffineTransform)
      */
     public void drawRenderedImage(RenderedImage image, AffineTransform xform) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -188,7 +184,6 @@ public void drawRenderedImage(RenderedImage image, AffineTransform xform) {
      */
     public void drawString(AttributedCharacterIterator iterator, float x,
                            float y) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -255,7 +250,6 @@ public Paint getPaint() {
      * @see java.awt.Graphics2D#getRenderingHint(java.awt.RenderingHints.Key)
      */
     public Object getRenderingHint(Key hintKey) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -264,7 +258,6 @@ public Object getRenderingHint(Key hintKey) {
      * @see java.awt.Graphics2D#getRenderingHints()
      */
     public RenderingHints getRenderingHints() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -292,7 +285,6 @@ public AffineTransform getTransform() {
      * @see java.awt.Graphics2D#hit(java.awt.Rectangle, java.awt.Shape, boolean)
      */
     public boolean hit(Rectangle rect, Shape text, boolean onStroke) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -357,7 +349,6 @@ public void setPaint(Paint paint) {
      *      java.lang.Object)
      */
     public void setRenderingHint(Key hintKey, Object hintValue) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -366,7 +357,6 @@ public void setRenderingHint(Key hintKey, Object hintValue) {
      * @see java.awt.Graphics2D#setRenderingHints(java.util.Map)
      */
     public void setRenderingHints(Map<?, ?> hints) {
-        // TODO Auto-generated method stub
 
     }
 
@@ -532,7 +522,6 @@ public void drawArc(int x, int y, int width, int height, int startAngle,
      */
     public boolean drawImage(Image image, int x, int y, Color bgcolor,
                              ImageObserver observer) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -546,7 +535,6 @@ public boolean drawImage(Image image, int x, int y, Color bgcolor,
      *      java.awt.image.ImageObserver)
      */
     public boolean drawImage(Image image, int x, int y, ImageObserver observer) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -564,7 +552,6 @@ public boolean drawImage(Image image, int x, int y, ImageObserver observer) {
      */
     public boolean drawImage(Image image, int x, int y, int width, int height,
                              Color bgcolor, ImageObserver observer) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -581,7 +568,6 @@ public boolean drawImage(Image image, int x, int y, int width, int height,
      */
     public boolean drawImage(Image image, int x, int y, int width, int height,
                              ImageObserver observer) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -604,7 +590,6 @@ public boolean drawImage(Image image, int x, int y, int width, int height,
     public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2,
                              int sx1, int sy1, int sx2, int sy2, Color bgcolor,
                              ImageObserver observer) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -625,7 +610,6 @@ public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2,
      */
     public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2,
                              int sx1, int sy1, int sx2, int sy2, ImageObserver observer) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -890,7 +874,6 @@ public FontRenderContext getFontRenderContext() {
      *      float, float)
      */
     public void drawGlyphVector(GlyphVector g, float x, float y) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/gui/src/awt/org/jnode/awt/util/AbstractSurfaceGraphics.java b/gui/src/awt/org/jnode/awt/util/AbstractSurfaceGraphics.java
index d2859c0279..36c37f8bf3 100644
--- a/gui/src/awt/org/jnode/awt/util/AbstractSurfaceGraphics.java
+++ b/gui/src/awt/org/jnode/awt/util/AbstractSurfaceGraphics.java
@@ -306,7 +306,6 @@ public final void drawImage(BufferedImage image, BufferedImageOp op, int x, int
      */
     public final boolean drawImage(Image image, AffineTransform xform, ImageObserver obs) {
         log.debug("JnodeGraphics: drawImage");
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -326,7 +325,6 @@ public final void drawRenderableImage(RenderableImage image, AffineTransform xfo
      * @see java.awt.Graphics2D#drawRenderedImage(java.awt.image.RenderedImage, java.awt.geom.AffineTransform)
      */
     public final void drawRenderedImage(RenderedImage image, AffineTransform xform) {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java b/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java
index 98be558f8b..de9f93b5a6 100644
--- a/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java
+++ b/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java
@@ -488,7 +488,6 @@ private final void setConfig32(RecordID rid, int value) throws DriverException {
      * @see org.jnode.driver.net.wireless.spi.WirelessDeviceCore#setESSID(java.lang.String)
      */
     protected void setESSID(String essid) throws DriverException {
-        // TODO Auto-generated method stub
 
     }
 
@@ -496,7 +495,6 @@ protected void setESSID(String essid) throws DriverException {
      * @see org.jnode.driver.net.wireless.spi.WirelessDeviceCore#startScan()
      */
     public void startScan() {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/net/src/net/org/jnode/net/ipv4/config/impl/NetDeviceMonitor.java b/net/src/net/org/jnode/net/ipv4/config/impl/NetDeviceMonitor.java
index a2c29391c3..0afc1fa1ab 100644
--- a/net/src/net/org/jnode/net/ipv4/config/impl/NetDeviceMonitor.java
+++ b/net/src/net/org/jnode/net/ipv4/config/impl/NetDeviceMonitor.java
@@ -74,7 +74,6 @@ public void deviceStarted(Device device) {
      * @see org.jnode.driver.DeviceListener#deviceStop(org.jnode.driver.Device)
      */
     public void deviceStop(Device device) {
-        // TODO Auto-generated method stub
 
     }
     
diff --git a/net/src/net/org/jnode/net/ipv4/tcp/TCPOutputStream.java b/net/src/net/org/jnode/net/ipv4/tcp/TCPOutputStream.java
index 424c9c4615..62f6cce055 100644
--- a/net/src/net/org/jnode/net/ipv4/tcp/TCPOutputStream.java
+++ b/net/src/net/org/jnode/net/ipv4/tcp/TCPOutputStream.java
@@ -63,7 +63,6 @@ public void close() throws IOException {
      * @see java.io.OutputStream#flush()
      */
     public void flush() throws IOException {
-        // TODO Auto-generated method stub
         super.flush();
     }
 
diff --git a/net/src/net/org/jnode/net/ipv4/tcp/TCPProtocol.java b/net/src/net/org/jnode/net/ipv4/tcp/TCPProtocol.java
index 292af1ec2b..4ba175196e 100644
--- a/net/src/net/org/jnode/net/ipv4/tcp/TCPProtocol.java
+++ b/net/src/net/org/jnode/net/ipv4/tcp/TCPProtocol.java
@@ -208,7 +208,6 @@ public void receive(SocketBuffer skbuf) throws SocketException {
      * @see org.jnode.net.ipv4.IPv4Protocol#receiveError(org.jnode.net.SocketBuffer)
      */
     public void receiveError(SocketBuffer skbuf) throws SocketException {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/net/src/net/org/jnode/net/ipv4/tcp/TCPSocketImpl.java b/net/src/net/org/jnode/net/ipv4/tcp/TCPSocketImpl.java
index 45d69de5e8..18f5819871 100644
--- a/net/src/net/org/jnode/net/ipv4/tcp/TCPSocketImpl.java
+++ b/net/src/net/org/jnode/net/ipv4/tcp/TCPSocketImpl.java
@@ -245,7 +245,6 @@ protected void listen(int backlog) throws IOException {
      * @see java.net.SocketImpl#sendUrgentData(int)
      */
     protected void sendUrgentData(int data) throws IOException {
-        // TODO Auto-generated method stub
 
     }
 
@@ -253,7 +252,6 @@ protected void sendUrgentData(int data) throws IOException {
      * @see java.net.SocketOptions#setOption(int, java.lang.Object)
      */
     public void setOption(int option_id, Object val) throws SocketException {
-        // TODO Auto-generated method stub
 
     }
 
diff --git a/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java b/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java
index 32fdba3cfb..8096250a59 100644
--- a/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java
+++ b/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java
@@ -70,7 +70,6 @@ protected void doClose() {
      * @see java.net.DatagramSocketImpl#getTTL()
      */
     protected byte getTTL() throws IOException {
-        // TODO Auto-generated method stub
         return 0;
     }
 
@@ -115,7 +114,6 @@ public void setLocalPort(int localPort) {
      * @see java.net.DatagramSocketImpl#setTTL(byte)
      */
     protected void setTTL(byte ttl) throws IOException {
-        // TODO Auto-generated method stub
 
     }
 }
diff --git a/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java b/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java
index 0656c16af9..bb3ae1d4f1 100644
--- a/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java
+++ b/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java
@@ -198,7 +198,6 @@ protected final int getTimeToLive() throws IOException {
      * @see java.net.DatagramSocketImpl#join(java.net.InetAddress)
      */
     protected void join(InetAddress inetaddr) throws IOException {
-        // TODO Auto-generated method stub
     }
 
     /**
@@ -206,14 +205,12 @@ protected void join(InetAddress inetaddr) throws IOException {
      *      java.net.NetworkInterface)
      */
     protected void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf) throws IOException {
-        // TODO Auto-generated method stub
     }
 
     /**
      * @see java.net.DatagramSocketImpl#leave(java.net.InetAddress)
      */
     protected void leave(InetAddress inetaddr) throws IOException {
-        // TODO Auto-generated method stub
     }
 
     /**
@@ -221,14 +218,12 @@ protected void leave(InetAddress inetaddr) throws IOException {
      *      java.net.NetworkInterface)
      */
     protected void leaveGroup(SocketAddress mcastaddr, NetworkInterface netIf) throws IOException {
-        // TODO Auto-generated method stub
     }
 
     /**
      * @see java.net.DatagramSocketImpl#peek(java.net.InetAddress)
      */
     protected int peek(InetAddress i) throws IOException {
-        // TODO Auto-generated method stub
         return 0;
     }
 
diff --git a/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java b/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java
index 184cb8be42..2b1fbac0f0 100644
--- a/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java
+++ b/shell/src/shell/org/jnode/shell/bjorne/BjorneInterpreter.java
@@ -187,7 +187,6 @@ public synchronized Completable parsePartial(CommandShell shell, String partial)
     
     @Override
     public synchronized boolean help(CommandShell shell, String partial, PrintWriter pw) throws ShellException {
-        // TODO Auto-generated method stub
         return false;
     }
 
diff --git a/shell/src/shell/org/jnode/shell/bjorne/ListCommandNode.java b/shell/src/shell/org/jnode/shell/bjorne/ListCommandNode.java
index 8a1e562443..47fe8a2999 100644
--- a/shell/src/shell/org/jnode/shell/bjorne/ListCommandNode.java
+++ b/shell/src/shell/org/jnode/shell/bjorne/ListCommandNode.java
@@ -130,7 +130,6 @@ public BjornePipeline buildPipeline(BjorneContext context) throws ShellException
     
     @Override
     public void complete(CompletionInfo completions, CommandShell shell) throws CompletionException {
-        // TODO Auto-generated method stub
 
     }
 }
diff --git a/shell/src/shell/org/jnode/shell/help/def/NewSyntaxHelp.java b/shell/src/shell/org/jnode/shell/help/def/NewSyntaxHelp.java
index 12deabd49a..c20f727d83 100644
--- a/shell/src/shell/org/jnode/shell/help/def/NewSyntaxHelp.java
+++ b/shell/src/shell/org/jnode/shell/help/def/NewSyntaxHelp.java
@@ -129,7 +129,6 @@ public void usage(PrintWriter pw) {
 
     @Override
     public void details(PrintWriter pw) {
-        // TODO Auto-generated method stub
 
     }