Remove a bunch of unused variables