Updated delete mechanism