Skip to content

Remove some TODOs

Remove some TODOs #455