Remove old broken code after rewrite. [050a02d]