diff --git a/pkg/build/strategies/onbuild/onbuild.go b/pkg/build/strategies/onbuild/onbuild.go
index <HASH>..<HASH> 100644
--- a/pkg/build/strategies/onbuild/onbuild.go
+++ b/pkg/build/strategies/onbuild/onbuild.go
@@ -85,7 +85,7 @@ func (b *OnBuild) Build(request *api.Request) (*api.Result, error) {
 	}
 
 	glog.V(2).Info("Cleaning up temporary containers")
-	b.Cleanup(request)
+	b.garbage.Cleanup(request)
 
 	return &api.Result{
 		Success:    true,
@@ -124,10 +124,3 @@ func (b *OnBuild) Prepare(request *api.Request) error {
 
 	return b.source.Download(request)
 }
-
-func (b *OnBuild) Cleanup(request *api.Request) {
-	if request.PreserveWorkingDir {
-		return
-	}
-	b.fs.RemoveDirectory(request.WorkingDir)
-}
Remove unnecessary Cleanup() method in onbuild