notnull
removing unused method and stub rename
type stubbing rework