Cleanup ignat99 feat

New PR from https://github.com/Ignat99/OpenBazaar/pull/1 directly into OpenBazaar:develop.
@hoffmabc I think @Ignat99 replied to you here:
https://github.com/OpenBazaar/OpenBazaar/pull/690/files#r18356284