Update to (almost) bare minimum, cut out other rubbish