Adding intermediates file removal option