Wrap-up of initial structure cleanup for main