Remove extra references to nulls