Misc cleanup
Refactor stock info out of couchexport