Bring Sauce Labs back and minor cleanup