Clean-up to structure.