deleted comments, added todo