diff --git a/build.gradle b/build.gradle
index 3cc7fe8..6d9ca83 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,6 @@ repositories {
 }
 
 dependencies {
-    api 'com.google.code.findbugs:jsr305:2.0.1'
     api 'com.google.guava:guava:21.0'
     api 'org.apache.commons:commons-lang3:3.5'
     testImplementation 'junit:junit-dep:4.10'
diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
index a9fdbd4..ef7f546 100644
--- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java
+++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
@@ -13,7 +13,6 @@ import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
 
-import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -21,7 +20,7 @@ import java.util.List;
 public class CommandDispatcher<T> {
     private static final Predicate<CommandNode> HAS_COMMAND = new Predicate<CommandNode>() {
         @Override
-        public boolean apply(@Nullable CommandNode input) {
+        public boolean apply(CommandNode input) {
             return input != null && (input.getCommand() != null || Iterables.any(input.getChildren(), HAS_COMMAND));
         }
     };
diff --git a/src/main/java/com/mojang/brigadier/arguments/package-info.java b/src/main/java/com/mojang/brigadier/arguments/package-info.java
deleted file mode 100644
index 6fdd362..0000000
--- a/src/main/java/com/mojang/brigadier/arguments/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.mojang.brigadier.arguments;
-
-import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/src/main/java/com/mojang/brigadier/builder/package-info.java b/src/main/java/com/mojang/brigadier/builder/package-info.java
deleted file mode 100644
index f2f8816..0000000
--- a/src/main/java/com/mojang/brigadier/builder/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.mojang.brigadier.builder;
-
-import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/src/main/java/com/mojang/brigadier/context/package-info.java b/src/main/java/com/mojang/brigadier/context/package-info.java
deleted file mode 100644
index 4cf2a59..0000000
--- a/src/main/java/com/mojang/brigadier/context/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.mojang.brigadier.context;
-
-import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/src/main/java/com/mojang/brigadier/exceptions/package-info.java b/src/main/java/com/mojang/brigadier/exceptions/package-info.java
deleted file mode 100644
index f531b11..0000000
--- a/src/main/java/com/mojang/brigadier/exceptions/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.mojang.brigadier.exceptions;
-
-import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/src/main/java/com/mojang/brigadier/package-info.java b/src/main/java/com/mojang/brigadier/package-info.java
deleted file mode 100644
index 9f58053..0000000
--- a/src/main/java/com/mojang/brigadier/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.mojang.brigadier;
-
-import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/src/main/java/com/mojang/brigadier/tree/package-info.java b/src/main/java/com/mojang/brigadier/tree/package-info.java
deleted file mode 100644
index fdc0985..0000000
--- a/src/main/java/com/mojang/brigadier/tree/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.mojang.brigadier.tree;
-
-import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file