Further simplification of Stratum library