Remove the NULL state

NULL and NOSTATE seems to be redundant, plus the NULL state haven't been
used anywhere.

Change-Id: Iaf20dcc661c4334fe2b140306ee2310a83478bb6