add more NonNull annotations where necessary
remove stupid annotation