diff --git a/commands/history.go b/commands/history.go
index 4d5644a81f..eccd55d029 100644
--- a/commands/history.go
+++ b/commands/history.go
@@ -81,10 +81,6 @@ func (p *HistoryCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{
 		}
 		var hosts []string
 		for _, f := range files {
-			// TODO this "if block" will be deleted in a future release
-			if f.Name() == "all.json" {
-				continue
-			}
 			if filepath.Ext(f.Name()) != ".json" {
 				continue
 			}
diff --git a/report/json.go b/report/json.go
index 4781187453..acff8c8921 100644
--- a/report/json.go
+++ b/report/json.go
@@ -61,14 +61,6 @@ func (w JSONWriter) Write(scanResults []models.ScanResult) (err error) {
 	}
 
 	var jsonBytes []byte
-	if jsonBytes, err = json.Marshal(scanResults); err != nil {
-		return fmt.Errorf("Failed to Marshal to JSON: %s", err)
-	}
-	all := filepath.Join(path, "all.json")
-	if err := ioutil.WriteFile(all, jsonBytes, 0600); err != nil {
-		return fmt.Errorf("Failed to write JSON. path: %s, err: %s", all, err)
-	}
-
 	for _, r := range scanResults {
 		jsonPath := ""
 		if len(r.Container.ContainerID) == 0 {
@@ -117,10 +109,6 @@ func LoadOneScanHistory(jsonDir string) (scanHistory models.ScanHistory, err err
 		return
 	}
 	for _, file := range files {
-		// TODO this "if block" will be deleted in a future release
-		if file.Name() == "all.json" {
-			continue
-		}
 		if filepath.Ext(file.Name()) != ".json" {
 			continue
 		}
diff --git a/report/s3.go b/report/s3.go
index 95b7951ea8..f55484101a 100644
--- a/report/s3.go
+++ b/report/s3.go
@@ -78,16 +78,6 @@ func (w S3Writer) Write(scanResults []models.ScanResult) (err error) {
 	// http://docs.aws.amazon.com/sdk-for-go/latest/v1/developerguide/common-examples.title.html
 	svc := getS3()
 	timestr := time.Now().Format("20060102_1504")
-	key := fmt.Sprintf("%s/%s", timestr, "all.json")
-	_, err = svc.PutObject(&s3.PutObjectInput{
-		Bucket: &c.Conf.S3Bucket,
-		Key:    &key,
-		Body:   bytes.NewReader(jsonBytes),
-	})
-	if err != nil {
-		return fmt.Errorf("Failed to upload data to %s/%s, %s", c.Conf.S3Bucket, key, err)
-	}
-
 	for _, r := range scanResults {
 		key := ""
 		if len(r.Container.ContainerID) == 0 {