Remove out dated api
Merge branch 'more-on-chat' into ui-revolution