Unnecessary conditional removed