Version bump 1.8 -> 1.9

Some cleanup