Removed @NotNull annotations, now using Java 6