Drop more conditionals