remove todo for fixed issue