Mahendra | #00 | removing dead code