Change/drop not null

Drop NotNull types. Review by @smarter.