Remove extraneous checks for some programs
Move 'upload-vars' to 'vars'