Removing useless attributes
Update TODO.txt