OTTrade cleanup