more clean up on samples