Cleanup code and move StockExportColumn