Update the TODO list
Clean the unnecessary functions