Remove deprecated safe option