Chethan, Vinay | #0 | Remove unused code