Code clean: remove some autogenerated TODO