Missed some unused variables