Add TODO
Remove unused db_t structure members