and removeByGraphId argument changed
removed commentsource