Cleanup and reestructuring.