Fix: only delete offending user options (#94, #302)