Remove use of NotNull trait