Fixed Small Derp!

This reverts commit 5870ea20f4fd2ac930091bb7433ba29b820d62d2.

Change-Id: I881545faeabd41127c15e01e47609109f9a9b76a
Clear collection after we used

Change-Id: Idbec734a2227cb333ed1cc47d64647a9da460e76
Signed-off-by: Roger Chen <cxr514033970@gmail.com>