OTData cleanup