Cleantemp

Change-Id: I1edc6b6286ef0bb2375b016bdcf12bcd91135196