Removed wrong logic, as per code review

Post commit code review : Chezka Arevalo