Version bump and removal of legacy cruft.