Remove Moq (don't introduce superfluous concepts)