Cleanup in component.commons