Remove scraping

Change-Id: I90d08026cefb23d850dee47b3757a512e3f03676