added RemoveNotNull to generator