Remove @Nonnull from primitive fields