early work on cleaning up OTRKit and other unsused methods