Got rid of some cruft all the way back from Waldo implementation.