Tradeship n-e cleanup