Remove debugging code that mixed singleton and per-device behavior