deleted some unused variables