Small Trade & TradeSession Clean up