cleanup: moved scraping of CC to the top/beginning where it logically belongs