cleanup some unused samples and upgrade others