SPEC cleanup