delete crap, update names