got rid of unnecessary todo.