Cleaning up a tempary duplication created during TypeScript migration. Change-Id: I1a6aafb1630b9991ebd44f1f08a3eeece903b6e6