SPEC cleanup.