Remove some nulls that escape their local environment

TODO null??????!!!!!??????????????!