Repurposing R.Db and other manufacturing goodies

[Small_Kitty_Paws]

Or simply remove them and get rid of another batch of old, spaghetti code? There is no reason to add another pointless complexity.