Fixed delete mechanism
Fixed delete mechanism