Major clean-up and P5 instancing tests