Remove some unused variables and an unused goto label.