daemonized, cleaned out more old code