Update info and remove unused stuff