Clean ups and 2.1 preparation

There is more to do with the version.json stuff, but it doesn't break current functionality.