Updating to remove lots of crap