Remove some TODOs
Res without return