Remove unused var, adjust Version flags