Cleanup ignat99 feat

New PR from https://github.com/Ignat99/OpenBazaar/pull/1 directly into OpenBazaar:develop.