diff --git a/src/main/java/net/rubygrapefruit/platform/internal/DefaultFileSystem.java b/src/main/java/net/rubygrapefruit/platform/internal/DefaultFileSystem.java
index 23fb059..9cc4168 100644
--- a/src/main/java/net/rubygrapefruit/platform/internal/DefaultFileSystem.java
+++ b/src/main/java/net/rubygrapefruit/platform/internal/DefaultFileSystem.java
@@ -17,22 +17,18 @@ public class DefaultFileSystem implements FileSystem {
         this.remote = remote;
     }
 
-    @Override
     public String getDeviceName() {
         return deviceName;
     }
 
-    @Override
     public File getMountPoint() {
         return mountPoint;
     }
 
-    @Override
     public String getFileSystemType() {
         return fileSystemType;
     }
 
-    @Override
     public boolean isRemote() {
         return remote;
     }
diff --git a/src/main/java/net/rubygrapefruit/platform/internal/DefaultPosixFile.java b/src/main/java/net/rubygrapefruit/platform/internal/DefaultPosixFile.java
index fceeaf9..46bddf9 100755
--- a/src/main/java/net/rubygrapefruit/platform/internal/DefaultPosixFile.java
+++ b/src/main/java/net/rubygrapefruit/platform/internal/DefaultPosixFile.java
@@ -22,7 +22,6 @@ public class DefaultPosixFile implements PosixFile {
         this.characterEncoding = systemInfo.characterEncoding;
     }
 
-    @Override
     public void setMode(File file, int perms) {
         FunctionResult result = new FunctionResult();
         PosixFileFunctions.chmod(encode(file), perms, result);
@@ -31,7 +30,6 @@ public class DefaultPosixFile implements PosixFile {
         }
     }
 
-    @Override
     public int getMode(File file) {
         FunctionResult result = new FunctionResult();
         FileStat stat = new FileStat();
diff --git a/src/main/java/net/rubygrapefruit/platform/internal/DefaultProcess.java b/src/main/java/net/rubygrapefruit/platform/internal/DefaultProcess.java
index 3756660..466aa3d 100755
--- a/src/main/java/net/rubygrapefruit/platform/internal/DefaultProcess.java
+++ b/src/main/java/net/rubygrapefruit/platform/internal/DefaultProcess.java
@@ -1,11 +1,10 @@
-package net.rubygrapefruit.platform.internal;
-
-import net.rubygrapefruit.platform.*;
-import net.rubygrapefruit.platform.internal.jni.PosixProcessFunctions;
-
-public class DefaultProcess implements net.rubygrapefruit.platform.Process {
-    @Override
-    public int getProcessId() throws NativeException {
-        return PosixProcessFunctions.getPid();
-    }
-}
+package net.rubygrapefruit.platform.internal;
+
+import net.rubygrapefruit.platform.*;
+import net.rubygrapefruit.platform.internal.jni.PosixProcessFunctions;
+
+public class DefaultProcess implements net.rubygrapefruit.platform.Process {
+    public int getProcessId() throws NativeException {
+        return PosixProcessFunctions.getPid();
+    }
+}
diff --git a/src/main/java/net/rubygrapefruit/platform/internal/MutableSystemInfo.java b/src/main/java/net/rubygrapefruit/platform/internal/MutableSystemInfo.java
index d5fbbde..c8582b8 100644
--- a/src/main/java/net/rubygrapefruit/platform/internal/MutableSystemInfo.java
+++ b/src/main/java/net/rubygrapefruit/platform/internal/MutableSystemInfo.java
@@ -8,17 +8,14 @@ public class MutableSystemInfo implements SystemInfo {
     public String characterEncoding;
     public String machineArchitecture;
 
-    @Override
     public String getKernelName() {
         return osName;
     }
 
-    @Override
     public String getKernelVersion() {
         return osVersion;
     }
 
-    @Override
     public String getMachineArchitecture() {
         return machineArchitecture;
     }
diff --git a/src/main/java/net/rubygrapefruit/platform/internal/PosixFileSystems.java b/src/main/java/net/rubygrapefruit/platform/internal/PosixFileSystems.java
index 7125d30..665096c 100644
--- a/src/main/java/net/rubygrapefruit/platform/internal/PosixFileSystems.java
+++ b/src/main/java/net/rubygrapefruit/platform/internal/PosixFileSystems.java
@@ -8,7 +8,6 @@ import net.rubygrapefruit.platform.internal.jni.PosixFileSystemFunctions;
 import java.util.List;
 
 public class PosixFileSystems implements FileSystems {
-    @Override
     public List<FileSystem> getFileSystems() {
         FunctionResult result = new FunctionResult();
         FileSystemList fileSystems = new FileSystemList();
diff --git a/src/main/java/net/rubygrapefruit/platform/internal/TerminfoTerminal.java b/src/main/java/net/rubygrapefruit/platform/internal/TerminfoTerminal.java
index 4fc3b07..58f9f94 100755
--- a/src/main/java/net/rubygrapefruit/platform/internal/TerminfoTerminal.java
+++ b/src/main/java/net/rubygrapefruit/platform/internal/TerminfoTerminal.java
@@ -35,7 +35,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         }
     }
 
-    @Override
     public TerminalSize getTerminalSize() {
         MutableTerminalSize terminalSize = new MutableTerminalSize();
         FunctionResult result = new FunctionResult();
@@ -46,22 +45,18 @@ public class TerminfoTerminal extends AbstractTerminal {
         return terminalSize;
     }
 
-    @Override
     public boolean supportsColor() {
         return capabilities.colors;
     }
 
-    @Override
     public boolean supportsCursorMotion() {
         return capabilities.cursorMotion;
     }
 
-    @Override
     public boolean supportsTextAttributes() {
         return capabilities.textAttributes;
     }
 
-    @Override
     public Terminal foreground(Color color) {
         if (!capabilities.colors) {
             return this;
@@ -78,7 +73,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal bold() {
         if (!capabilities.textAttributes) {
             return this;
@@ -94,7 +88,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal normal() {
         reset();
         if (foreground != null) {
@@ -103,7 +96,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal reset() {
         stream.flush();
         FunctionResult result = new FunctionResult();
@@ -114,7 +106,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorDown(int count) {
         stream.flush();
         FunctionResult result = new FunctionResult();
@@ -125,7 +116,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorUp(int count) {
         stream.flush();
         FunctionResult result = new FunctionResult();
@@ -136,7 +126,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorLeft(int count) {
         stream.flush();
         FunctionResult result = new FunctionResult();
@@ -147,7 +136,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorRight(int count) {
         stream.flush();
         FunctionResult result = new FunctionResult();
@@ -158,7 +146,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorStartOfLine() throws NativeException {
         stream.flush();
         FunctionResult result = new FunctionResult();
@@ -169,7 +156,6 @@ public class TerminfoTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal clearToEndOfLine() throws NativeException {
         stream.flush();
         FunctionResult result = new FunctionResult();
diff --git a/src/main/java/net/rubygrapefruit/platform/internal/TerminfoTerminalAccess.java b/src/main/java/net/rubygrapefruit/platform/internal/TerminfoTerminalAccess.java
index 767c078..c3b103b 100755
--- a/src/main/java/net/rubygrapefruit/platform/internal/TerminfoTerminalAccess.java
+++ b/src/main/java/net/rubygrapefruit/platform/internal/TerminfoTerminalAccess.java
@@ -8,12 +8,10 @@ public class TerminfoTerminalAccess implements TerminalAccess {
     private static Output currentlyOpen;
     private static TerminfoTerminal current;
 
-    @Override
     public boolean isTerminal(Output output) {
         return PosixTerminalFunctions.isatty(output.ordinal());
     }
 
-    @Override
     public Terminal getTerminal(Output output) {
         if (currentlyOpen != null && currentlyOpen != output) {
             throw new UnsupportedOperationException("Currently only one output can be used as a terminal.");
diff --git a/src/main/java/net/rubygrapefruit/platform/internal/WindowsTerminal.java b/src/main/java/net/rubygrapefruit/platform/internal/WindowsTerminal.java
index de91b71..efe66e7 100755
--- a/src/main/java/net/rubygrapefruit/platform/internal/WindowsTerminal.java
+++ b/src/main/java/net/rubygrapefruit/platform/internal/WindowsTerminal.java
@@ -27,22 +27,18 @@ public class WindowsTerminal extends AbstractTerminal {
         }
     }
 
-    @Override
     public boolean supportsColor() {
         return true;
     }
 
-    @Override
     public boolean supportsTextAttributes() {
         return true;
     }
 
-    @Override
     public boolean supportsCursorMotion() {
         return true;
     }
 
-    @Override
     public TerminalSize getTerminalSize() {
         FunctionResult result = new FunctionResult();
         MutableTerminalSize size = new MutableTerminalSize();
@@ -53,7 +49,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return size;
     }
 
-    @Override
     public Terminal bold() {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.bold(result);
@@ -63,7 +58,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal foreground(Color color) {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.foreground(color.ordinal(), result);
@@ -73,7 +67,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal normal() {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.normal(result);
@@ -83,7 +76,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal reset() {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.reset(result);
@@ -93,7 +85,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorDown(int count) throws NativeException {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.down(count, result);
@@ -103,7 +94,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorUp(int count) throws NativeException {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.up(count, result);
@@ -113,7 +103,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorLeft(int count) throws NativeException {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.left(count, result);
@@ -123,7 +112,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorRight(int count) throws NativeException {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.right(count, result);
@@ -133,7 +121,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal cursorStartOfLine() throws NativeException {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.startLine(result);
@@ -143,7 +130,6 @@ public class WindowsTerminal extends AbstractTerminal {
         return this;
     }
 
-    @Override
     public Terminal clearToEndOfLine() throws NativeException {
         FunctionResult result = new FunctionResult();
         WindowsConsoleFunctions.clearToEndOfLine(result);
diff --git a/src/main/java/net/rubygrapefruit/platform/internal/WindowsTerminalAccess.java b/src/main/java/net/rubygrapefruit/platform/internal/WindowsTerminalAccess.java
index 7a7da3c..6e5a1f0 100755
--- a/src/main/java/net/rubygrapefruit/platform/internal/WindowsTerminalAccess.java
+++ b/src/main/java/net/rubygrapefruit/platform/internal/WindowsTerminalAccess.java
@@ -9,7 +9,6 @@ public class WindowsTerminalAccess implements TerminalAccess {
     private static Output currentlyOpen;
     private static WindowsTerminal current;
 
-    @Override
     public boolean isTerminal(Output output) {
         FunctionResult result = new FunctionResult();
         boolean console = WindowsConsoleFunctions.isConsole(output.ordinal(), result);
@@ -20,7 +19,6 @@ public class WindowsTerminalAccess implements TerminalAccess {
         return console;
     }
 
-    @Override
     public Terminal getTerminal(Output output) {
         if (currentlyOpen !=null && currentlyOpen != output) {
             throw new UnsupportedOperationException("Currently only one output can be used as a terminal.");