[MOD] Removed @Nonnull annotations, will be on package level in the
future, overriden by @Nullable if needed.