remove todo comments after checking they don't apply