*8087* Removed dead code