- fix thrift server
- fix wcf server
- further cleanup