Remove debug lines
Update commandline tool