Clean up component structure