removing unnecessary conditional