Remove duplicate ServiceWiring definitions