Removed some unnecessary lines and some finals.

I'm still unsure on how to use final in the code, I think I'll leave it
out for local variables.