remove unneeded conditionals