Cleanup and new samples