Remove unnecessary type definitions and their associated constructor/destructor so the code coverage can be completed