Remove dead code that caused performance problems in the past.