I noticed that Windows 10 was taking about 30 seconds to both shutdown and restart, so i added a VerboseStatus key and set it's value to 1 to here to see what was causing the issue

Turns out 2 services where causing the issue
1 Delivery Optimization Service
2 Nvidia Streamer Service

So I disabled both and reboot and shutdown now takes about 10 seconds.
I don't play games so Nvidia Streamer Service will not affect me.

From what I can see
Delivery Optimization Service is related to "updates from more than one place" in Windows update which I have disable anyway.
So my question is, is it OK to disable this, I would assume so, but would like verification

Thanks in advance