Removed unnecessary logic

Removed unnecessary logic