Eliminated some unused variables