More spec cleanup