Remove some previously buggy but dead code that I mistakenly resurrected