Removes obsolete line
Merge branch 'refs/heads/master' into cli
Removes obsolete todo