Clean up service selection