Cleanup Tool Changes

Unfortunately the changes highlighted in this pull request include the client changes. maybe they will be excluded as soon as i accept the other pull request.
The name of the "metadata_delete" option is confusing. It seems to set the timeout and should express this in its name.