Clean up new code related to adding IServiceCallSite