Removing conditionals