Merge "Removing some usused features" into tm-qpr-dev