Missed some more junk in previous commit