Revert "Revert "Remove some Internal* abstractions""

This reverts commit b2530e89fcef841a92f77147c0b2f4ccc5d56715.
Fix compile errors in NoneIndexShardGateway