Clean up and addition of samples