Removed a few unused variables