A few more cleaning, Upgrade version (2.9)