Removed 'remove-all option