Added possibility to remove services