Remove useless fallback case

My bad ;-)
Some fixes