Revert "Adding scrapping code"

This reverts commit 057d75b8432dc3f2c994bb62581dbe08efc261d9.