Remove redundant imports
Merge branch 'master' of github.com:ismail-s/ishyChat