Merge "1/ Remove some unused code from the shared lib" into tm-dev