ref #6694 Use service methods to add and remove features