Remove some now unused variables