Initial simplifications of OTServer