tidy up delete options and related tests