Add CF delete and fix simple handling.

Redirect back to preferences when saving in advanced view.
Re-use destination sets in simple view.