Remove unnecessary if conditional