Removed unused variables

For better!