HCOLL-216 added removeLater