Clean up code [ComponentStatus]