notnull, cleanup