Comment dead code for now CID 18083
Remove dead code CID 18089
Remove dead code CID 18090