Merge pull request #7324 from minosgalanakis/bignum/remove-scaffolding

bignum: Removed merge scaffolding