@ctweney Good point. This is temporary code that will go away when we bucketize the services in CLC-1354, so I'll hold off on optimizing this for now.