Remove a few empty 'mock' classes