some more component cleanup