remove unnecessary logic