Update version and remove commented code