* Removed unused variables and parameters as part of code clean-up