Remove remaining NonNull annotations