Cleanup various fix me refs

Was in daemon.go, saw these and couldn't help myself.