Further simplifications to the sample container