Skip to content

Remove the TODO

Remove the TODO #588