Remove todo and fix include