Cleanup; Don't use has_cc variable since it is used later