*8094* Remove dead code