removing a couple of unused variables