*8693* Remove dead code