remove useless code
Merge branch 'master' into united-todo-list