remove commented out code
Remove a bunch of code we don't need
Correct variable name