Remove crap, fix upgrade step v2