more component cleanup