diff --git a/openstack/storage/v1/accounts/requests.go b/openstack/storage/v1/accounts/requests.go
index 7b84497..3ffc5f7 100644
--- a/openstack/storage/v1/accounts/requests.go
+++ b/openstack/storage/v1/accounts/requests.go
@@ -1,20 +1,19 @@
 package accounts
 
 import (
-	"github.com/racker/perigee"
-	storage "github.com/rackspace/gophercloud/openstack/storage/v1"
 	"net/http"
+
+	"github.com/racker/perigee"
+	"github.com/rackspace/gophercloud"
 )
 
 // GetResult is a *http.Response that is returned from a call to the Get function.
 type GetResult *http.Response
 
 // Update is a function that creates, updates, or deletes an account's metadata.
-func Update(c *storage.Client, opts UpdateOpts) error {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return err
-	}
+func Update(c *gophercloud.ServiceClient, opts UpdateOpts) error {
+	h := c.Provider.AuthenticatedHeaders()
+
 	for k, v := range opts.Headers {
 		h[k] = v
 	}
@@ -32,11 +31,8 @@
 
 // Get is a function that retrieves an account's metadata. To extract just the custom
 // metadata, pass the GetResult response to the ExtractMetadata function.
-func Get(c *storage.Client, opts GetOpts) (GetResult, error) {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return nil, err
-	}
+func Get(c *gophercloud.ServiceClient, opts GetOpts) (GetResult, error) {
+	h := c.Provider.AuthenticatedHeaders()
 
 	for k, v := range opts.Headers {
 		h[k] = v
diff --git a/openstack/storage/v1/client.go b/openstack/storage/v1/client.go
deleted file mode 100644
index 51312eb..0000000
--- a/openstack/storage/v1/client.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package v1
-
-import (
-	"fmt"
-
-	"github.com/rackspace/gophercloud"
-	identity "github.com/rackspace/gophercloud/openstack/identity/v2"
-)
-
-// Client is a structure that contains information for communicating with a provider.
-type Client struct {
-	endpoint  string
-	authority identity.AuthResults
-	options   gophercloud.AuthOptions
-	token     *identity.Token
-}
-
-// NewClient creates and returns a *Client.
-func NewClient(e string, a identity.AuthResults, o gophercloud.AuthOptions) *Client {
-	return &Client{
-		endpoint:  e,
-		authority: a,
-		options:   o,
-	}
-}
-
-// GetAccountURL returns the URI for making Account requests. This function is exported to allow
-// the 'Accounts' subpackage to use it. It is not meant for public consumption.
-func (c *Client) GetAccountURL() string {
-	return fmt.Sprintf("%s", c.endpoint)
-}
-
-// GetContainerURL returns the URI for making Container requests. This function is exported to allow
-// the 'Containers' subpackage to use it. It is not meant for public consumption.
-func (c *Client) GetContainerURL(container string) string {
-	return fmt.Sprintf("%s/%s", c.endpoint, container)
-}
-
-// GetObjectURL returns the URI for making Object requests. This function is exported to allow
-// the 'Objects' subpackage to use it. It is not meant for public consumption.
-func (c *Client) GetObjectURL(container, object string) string {
-	return fmt.Sprintf("%s/%s/%s", c.endpoint, container, object)
-}
-
-// GetHeaders is a function that gets the header for token authentication against a client's endpoint.
-// This function is exported to allow the subpackages to use it. It is not meant for public consumption.
-func (c *Client) GetHeaders() (map[string]string, error) {
-	t, err := c.getAuthToken()
-	if err != nil {
-		return map[string]string{}, err
-	}
-
-	return map[string]string{
-		"X-Auth-Token": t,
-	}, nil
-}
-
-// getAuthToken is a function that tries to retrieve an authentication token from a client's endpoint.
-func (c *Client) getAuthToken() (string, error) {
-	var err error
-
-	if c.token == nil {
-		c.token, err = identity.GetToken(c.authority)
-		if err != nil {
-			return "", err
-		}
-	}
-
-	return c.token.ID, err
-}
diff --git a/openstack/storage/v1/containers/requests.go b/openstack/storage/v1/containers/requests.go
index b6d3a89..d2cec0b 100644
--- a/openstack/storage/v1/containers/requests.go
+++ b/openstack/storage/v1/containers/requests.go
@@ -1,10 +1,11 @@
 package containers
 
 import (
-	"github.com/racker/perigee"
-	storage "github.com/rackspace/gophercloud/openstack/storage/v1"
-	"github.com/rackspace/gophercloud/openstack/utils"
 	"net/http"
+
+	"github.com/racker/perigee"
+	"github.com/rackspace/gophercloud"
+	"github.com/rackspace/gophercloud/openstack/utils"
 )
 
 // ListResult is a *http.Response that is returned from a call to the List function.
@@ -16,13 +17,10 @@
 // List is a function that retrieves all objects in a container. It also returns the details
 // for the account. To extract just the container information or names, pass the ListResult
 // response to the ExtractInfo or ExtractNames function, respectively.
-func List(c *storage.Client, opts ListOpts) (ListResult, error) {
+func List(c *gophercloud.ServiceClient, opts ListOpts) (ListResult, error) {
 	contentType := ""
 
-	h, err := c.GetHeaders()
-	if err != nil {
-		return nil, err
-	}
+	h := c.Provider.AuthenticatedHeaders()
 
 	query := utils.BuildQuery(opts.Params)
 
@@ -39,13 +37,10 @@
 }
 
 // Create is a function that creates a new container.
-func Create(c *storage.Client, opts CreateOpts) (Container, error) {
+func Create(c *gophercloud.ServiceClient, opts CreateOpts) (Container, error) {
 	var ci Container
 
-	h, err := c.GetHeaders()
-	if err != nil {
-		return Container{}, err
-	}
+	h := c.Provider.AuthenticatedHeaders()
 
 	for k, v := range opts.Headers {
 		h[k] = v
@@ -68,27 +63,22 @@
 }
 
 // Delete is a function that deletes a container.
-func Delete(c *storage.Client, opts DeleteOpts) error {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return err
-	}
+func Delete(c *gophercloud.ServiceClient, opts DeleteOpts) error {
+	h := c.Provider.AuthenticatedHeaders()
 
 	query := utils.BuildQuery(opts.Params)
 
-	url := c.GetContainerURL(opts.Name) + query
-	_, err = perigee.Request("DELETE", url, perigee.Options{
+	url := getContainerURL(c, opts.Name) + query
+	_, err := perigee.Request("DELETE", url, perigee.Options{
 		MoreHeaders: h,
+		OkCodes:     []int{204},
 	})
 	return err
 }
 
 // Update is a function that creates, updates, or deletes a container's metadata.
-func Update(c *storage.Client, opts UpdateOpts) error {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return err
-	}
+func Update(c *gophercloud.ServiceClient, opts UpdateOpts) error {
+	h := c.Provider.AuthenticatedHeaders()
 
 	for k, v := range opts.Headers {
 		h[k] = v
@@ -107,11 +97,8 @@
 
 // Get is a function that retrieves the metadata of a container. To extract just the custom
 // metadata, pass the GetResult response to the ExtractMetadata function.
-func Get(c *storage.Client, opts GetOpts) (GetResult, error) {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return nil, err
-	}
+func Get(c *gophercloud.ServiceClient, opts GetOpts) (GetResult, error) {
+	h := c.Provider.AuthenticatedHeaders()
 
 	for k, v := range opts.Metadata {
 		h["X-Container-Meta-"+k] = v
diff --git a/openstack/storage/v1/objects/requests.go b/openstack/storage/v1/objects/requests.go
index 4e6f23a..bb9c4ac 100644
--- a/openstack/storage/v1/objects/requests.go
+++ b/openstack/storage/v1/objects/requests.go
@@ -2,10 +2,11 @@
 
 import (
 	"fmt"
-	"github.com/racker/perigee"
-	storage "github.com/rackspace/gophercloud/openstack/storage/v1"
-	"github.com/rackspace/gophercloud/openstack/utils"
 	"net/http"
+
+	"github.com/racker/perigee"
+	"github.com/rackspace/gophercloud"
+	"github.com/rackspace/gophercloud/openstack/utils"
 )
 
 // ListResult is a *http.Response that is returned from a call to the List function.
@@ -20,13 +21,10 @@
 // List is a function that retrieves all objects in a container. It also returns the details
 // for the container. To extract only the object information or names, pass the ListResult
 // response to the ExtractInfo or ExtractNames function, respectively.
-func List(c *storage.Client, opts ListOpts) (ListResult, error) {
+func List(c *gophercloud.ServiceClient, opts ListOpts) (ListResult, error) {
 	contentType := ""
 
-	h, err := c.GetHeaders()
-	if err != nil {
-		return nil, err
-	}
+	h := c.Provider.AuthenticatedHeaders()
 
 	query := utils.BuildQuery(opts.Params)
 
@@ -45,11 +43,8 @@
 // Download is a function that retrieves the content and metadata for an object.
 // To extract just the content, pass the DownloadResult response to the ExtractContent
 // function.
-func Download(c *storage.Client, opts DownloadOpts) (DownloadResult, error) {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return nil, err
-	}
+func Download(c *gophercloud.ServiceClient, opts DownloadOpts) (DownloadResult, error) {
+	h := c.Provider.AuthenticatedHeaders()
 
 	for k, v := range opts.Headers {
 		h[k] = v
@@ -65,13 +60,10 @@
 }
 
 // Create is a function that creates a new object or replaces an existing object.
-func Create(c *storage.Client, opts CreateOpts) error {
+func Create(c *gophercloud.ServiceClient, opts CreateOpts) error {
 	var reqBody []byte
 
-	h, err := c.GetHeaders()
-	if err != nil {
-		return err
-	}
+	h := c.Provider.AuthenticatedHeaders()
 
 	for k, v := range opts.Headers {
 		h[k] = v
@@ -86,7 +78,7 @@
 	content := opts.Content
 	if content != nil {
 		reqBody = make([]byte, 0)
-		_, err = content.Read(reqBody)
+		_, err := content.Read(reqBody)
 		if err != nil {
 			return err
 		}
@@ -101,11 +93,8 @@
 }
 
 // Copy is a function that copies one object to another.
-func Copy(c *storage.Client, opts CopyOpts) error {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return err
-	}
+func Copy(c *gophercloud.ServiceClient, opts CopyOpts) error {
+	h := c.Provider.AuthenticatedHeaders()
 
 	for k, v := range opts.Metadata {
 		h["X-Object-Meta-"+k] = v
@@ -121,11 +110,8 @@
 }
 
 // Delete is a function that deletes an object.
-func Delete(c *storage.Client, opts DeleteOpts) error {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return err
-	}
+func Delete(c *gophercloud.ServiceClient, opts DeleteOpts) error {
+	h := c.Provider.AuthenticatedHeaders()
 
 	query := utils.BuildQuery(opts.Params)
 
@@ -138,29 +124,24 @@
 
 // Get is a function that retrieves the metadata of an object. To extract just the custom
 // metadata, pass the GetResult response to the ExtractMetadata function.
-func Get(c *storage.Client, opts GetOpts) (GetResult, error) {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return nil, err
-	}
+func Get(c *gophercloud.ServiceClient, opts GetOpts) (GetResult, error) {
+	h := c.Provider.AuthenticatedHeaders()
 
 	for k, v := range opts.Headers {
 		h[k] = v
 	}
 
-	url := c.GetObjectURL(opts.Container, opts.Name)
+	url := getObjectURL(c, opts.Container, opts.Name)
 	resp, err := perigee.Request("HEAD", url, perigee.Options{
 		MoreHeaders: h,
+		OkCodes:     []int{204},
 	})
 	return &resp.HttpResponse, err
 }
 
 // Update is a function that creates, updates, or deletes an object's metadata.
-func Update(c *storage.Client, opts UpdateOpts) error {
-	h, err := c.GetHeaders()
-	if err != nil {
-		return err
-	}
+func Update(c *gophercloud.ServiceClient, opts UpdateOpts) error {
+	h := c.Provider.AuthenticatedHeaders()
 
 	for k, v := range opts.Headers {
 		h[k] = v