src: refractoring on delete mechanism