Changelog and version changes

Also minor removals of unnecessary code