Remove unecesary code

Change-Id: Icbef081d9201b9118c21457fef506fc698abbbc6