tentative janitorial TODO list