Removed some unused variables. There is a lot more of them.