On-hand entries cleanup