Add missing var.
Clean up commented-out code.