Odd string are removed
Some TODO are removed