Scrape component/fill roster cleanup