clean up todo, added to github issues