Merge "remove unused svc exports"