Removing typedef

Change-Id: I2660fc385ba6c77abf84db6e605b6a428d340095