extended cleanup of components
cleanup