Optimize deletion of entries in List Component

No Ticket.

Reviewer: Aldrin