Completely remove EventStoreId.Default from the code