Remove legacy-services from the kitchen-sink