removed a couple of unreferenced variables