Some more values changes
Getting rid of the cruft