Removed extra variables/methods
Removed unused variables and methods