Remove a few empty 'mock' classes
12 files changed