more samples and cleanup