move back to 2.9 - compiles
Remove more 2.10 stuff
Tests run without hanging