1.7.10 and big cleanup