diff --git a/api/server/server_unit_test.go b/api/server/server_unit_test.go
index f83b5cc54f..871f6981f0 100644
--- a/api/server/server_unit_test.go
+++ b/api/server/server_unit_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api"
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/engine"
 	"github.com/docker/docker/pkg/version"
 )
@@ -122,7 +123,7 @@ func TestGetImagesJSON(t *testing.T) {
 	eng.Register("images", func(job *engine.Job) error {
 		called = true
 		v := createEnvFromGetImagesJSONStruct(sampleImage)
-		if _, err := v.WriteTo(job.Stdout); err != nil {
+		if err := json.NewEncoder(job.Stdout).Encode(v); err != nil {
 			return err
 		}
 		return nil
@@ -186,9 +187,10 @@ func TestGetImagesJSONLegacyFormat(t *testing.T) {
 	var called bool
 	eng.Register("images", func(job *engine.Job) error {
 		called = true
-		outsLegacy := engine.NewTable("Created", 0)
-		outsLegacy.Add(createEnvFromGetImagesJSONStruct(sampleImage))
-		if _, err := outsLegacy.WriteListTo(job.Stdout); err != nil {
+		images := []types.Image{
+			createEnvFromGetImagesJSONStruct(sampleImage),
+		}
+		if err := json.NewEncoder(job.Stdout).Encode(images); err != nil {
 			return err
 		}
 		return nil
@@ -526,14 +528,14 @@ func assertHttpNotError(r *httptest.ResponseRecorder, t *testing.T) {
 	}
 }
 
-func createEnvFromGetImagesJSONStruct(data getImagesJSONStruct) *engine.Env {
-	v := &engine.Env{}
-	v.SetList("RepoTags", data.RepoTags)
-	v.Set("Id", data.Id)
-	v.SetInt64("Created", data.Created)
-	v.SetInt64("Size", data.Size)
-	v.SetInt64("VirtualSize", data.VirtualSize)
-	return v
+func createEnvFromGetImagesJSONStruct(data getImagesJSONStruct) types.Image {
+	return types.Image{
+		RepoTags:    data.RepoTags,
+		ID:          data.Id,
+		Created:     int(data.Created),
+		Size:        int(data.Size),
+		VirtualSize: int(data.VirtualSize),
+	}
 }
 
 type getImagesJSONStruct struct {
diff --git a/daemon/network_settings.go b/daemon/network_settings.go
index 97c2e3ab46..bf683b2f0e 100644
--- a/daemon/network_settings.go
+++ b/daemon/network_settings.go
@@ -1,7 +1,6 @@
 package daemon
 
 import (
-	"github.com/docker/docker/engine"
 	"github.com/docker/docker/nat"
 )
 
@@ -22,27 +21,3 @@ type NetworkSettings struct {
 	PortMapping            map[string]PortMapping // Deprecated
 	Ports                  nat.PortMap
 }
-
-func (settings *NetworkSettings) PortMappingAPI() *engine.Table {
-	var outs = engine.NewTable("", 0)
-	for port, bindings := range settings.Ports {
-		p, _ := nat.ParsePort(port.Port())
-		if len(bindings) == 0 {
-			out := &engine.Env{}
-			out.SetInt("PrivatePort", p)
-			out.Set("Type", port.Proto())
-			outs.Add(out)
-			continue
-		}
-		for _, binding := range bindings {
-			out := &engine.Env{}
-			h, _ := nat.ParsePort(binding.HostPort)
-			out.SetInt("PrivatePort", p)
-			out.SetInt("PublicPort", h)
-			out.Set("Type", port.Proto())
-			out.Set("IP", binding.HostIp)
-			outs.Add(out)
-		}
-	}
-	return outs
-}
diff --git a/integration/api_test.go b/integration/api_test.go
index e978c311bf..cd6b9669be 100644
--- a/integration/api_test.go
+++ b/integration/api_test.go
@@ -16,6 +16,7 @@ import (
 
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/api/server"
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/builder"
 	"github.com/docker/docker/engine"
 	"github.com/docker/docker/runconfig"
@@ -793,12 +794,14 @@ func TestDeleteImages(t *testing.T) {
 		t.Fatalf("%d OK expected, received %d\n", http.StatusOK, r.Code)
 	}
 
-	outs := engine.NewTable("Created", 0)
-	if _, err := outs.ReadListFrom(r2.Body.Bytes()); err != nil {
+	delImages := []types.ImageDelete{}
+	err = json.Unmarshal(r2.Body.Bytes(), &delImages)
+	if err != nil {
 		t.Fatal(err)
 	}
-	if len(outs.Data) != 1 {
-		t.Fatalf("Expected %d event (untagged), got %d", 1, len(outs.Data))
+
+	if len(delImages) != 1 {
+		t.Fatalf("Expected %d event (untagged), got %d", 1, len(delImages))
 	}
 	images = getImages(eng, t, false, "")
 
diff --git a/integration/utils_test.go b/integration/utils_test.go
index 706ac6484c..c0e826a0f0 100644
--- a/integration/utils_test.go
+++ b/integration/utils_test.go
@@ -329,10 +329,6 @@ func fakeTar() (io.ReadCloser, error) {
 	return ioutil.NopCloser(buf), nil
 }
 
-func getAllImages(eng *engine.Engine, t *testing.T) *engine.Table {
-	return getImages(eng, t, true, "")
-}
-
 func getImages(eng *engine.Engine, t *testing.T, all bool, filter string) *engine.Table {
 	job := eng.Job("images")
 	job.SetenvBool("all", all)