remove todo from here in favor of raco issue