Removed unnecessary logic