Change log entry

Change shadowed variable name

Review comments

Missed change

Remove duplicate check

Add wrong remove

Review comments

Adding test case