Revert "Revert "Removing deprecated/unused/outdated code""
This reverts commit 51cc9c4c. Approved by TSC Change-Id: I43a29c6d2830e515cefbc9aab676aafcb1bb5112
This reverts commit 51cc9c4c. Approved by TSC Change-Id: I43a29c6d2830e515cefbc9aab676aafcb1bb5112