Clean up the PCDM autostart functionality a bit, as well as the restart daemon