Be more explicit how we treat legacy crap