Comment out unused if conditionals