Found a todo issue that implicitly utilizes the DB layer unnecessarily
Found a todo issue that implicitly utilizes the DB layer unnecessarily

kristopolous/DRR,kristopolous/DRR,kristopolous/DRR,kristopolous/DRR,kristopolous/DRR