remove printout
Merge branch 'master' into no_batch