Various minor fixes
simple fixes
Just portings from integration
Just removed useless imports (porting from integration)
Removed useless function
Added check for platform
just removed print
Merge pull request #1846 from fstagni/bunchFixesv6r11-1-corrected

[v6r11] Various minor fixes