disabling some log, too much noise
Merge branch 'master' into movie3
This is the official now
little cleanup]