get rid of some useless things
Merge branch 'master' of https://github.com/ziyue1118/chat