More sample cleanup