Remove comments
Remove dead TODOs