Refactoring

24 jobs for trusted-SystemDags-Core in 68 minutes and 53 seconds (queued for 2 seconds)