todo list and cleanup