Fix the comment, change logic on when to delete

Change-Id: Iffeed9661826df1d4b1eac179bd0b1e672320781