Merge "Removing some unused code:" into tm-qpr-dev