Merge "Call entry clean up when removing pending entries"