Clean up service and rename sink flowlet