Cleaning code, removing unused variables

A previous pull request i did, left some unused variables that must be removed. This pull request just cleans the code removing them