S-02002: cleanup