Remove a couple of kill-related advices

Those are made redundant by the awesome easy-kill.
annotate TODO in comments
Merge pull request #516 from gongzhitaao/prelude-annotate-todo

annotate TODO only in comments
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  annotate TODO in comments
  Remove a couple of kill-related advices