Remove obsolete variables, fix rejection from Demi about silent waiting with progress bar