Ass sample folder, other cleanup