clean up todo list; cut out mariadb code (can always steal it back out of here if you want it, though it's crummy that I didn't split this commit; I really need to start doing that)