Remove stuff from daemon; trying to simplify things