Remove dead code and add comment on daemons