minor cleanup in the sample system