cleaned up TODO list