Removed a couple other unused variables