cleanup temp resources (temp fix)

Change-Id: I7868354c201bd6ac10e66c61d0174395c4aabf4d