Added DeleteOnSuccess config option + implementation