*8594* Remove dead code