Bit of cleanup
fix version handling