`todo` comment should not longer be needed