Cleanup of IServiceDefinition