removing some nulls and verbose checks of nulls