Remove unnecessary conditional