Add todo
Extract a db cleaner