Clean up design structure