remove nullable support