minor cleaning and test structures