more spec cleanup