Upping version and removing unused code