WIP remove NULL self asserts