Cleanup of testcode