Add more daemon options; remove cleanup from upoptions