Update to latest versions of everything and strip out unused code