Clean up code and save non-cyclic component.