Remove some TODO
Change version