(PUP-2716) Remove references to dead settings