Remove the usage of NonNull, replace with validate statements