MovieScraper cleaned up