Remove unused variables

Removed some left over variables that don't get used.