Clean-up and restructuring.