Feature #953 Trader Gold - Unused code/warning resolved

Removed unused code
getBaseGold throws proper error
Merge remote-tracking branch 'jeffreyhaines/master'