*8749* Remove dead code