Minor scrapers cleanup