Stop using 'state' variables where not needed
Bump version and Changes file