More cleanup and simplification of OTServer