Cleanup, restructuring.