Remove unnecessary arguments; use existing variables. Cleanup

Status Job ID Name Coverage
  External
passed jenkins