remove and structuring services