Remove some dead code.
Implement mocking classes with constructors.