Refractoring on DeleteComponent Class