Entry removal algorithm changed