Remove unnecessary if clause