Added delete option + only deleting if option is set