Remove version count

It doesn't get updated anyway. Also general improvements