Removed InvocationContextEntitySource (not used)