removed unnecessary logic.