Ajay | #3456 | Removed unused variables