Remove unnecessary logic