Daemon: commented needless now code