Restore original patch
Comment out unused variable
Minor cleanup
Merge branch 'develop' into bitshares