Clear up a lot of old testing stuff