spec cleanup mostly