Continuing test structure cleanup