Get rid of set to null nonsense.