Cleanup and restructuring.