rm unused file
add notnull checker annotation