removed some unused variables