TODO update
Remove some comments