Hugely reduced CPU consumption of control-daemon