S2.1 cleanup