S-48324 cleanup