Moq removed