Clean up imports and dead test code.