Bump version
Comment out unused code, change vars to consts