Only publish for 2.10

This Pr also contains latent code stiling additions and removals.