Clean up restructure param