Get rid of unused unit test code