Merge "6/ Removing unused code from previous cleanup" into tm-qpr-dev