SPEC : cleanup