diff --git a/bootstrapvz/providers/azure/__init__.py b/bootstrapvz/providers/azure/__init__.py
index 6c10ab0..c86c549 100644
--- a/bootstrapvz/providers/azure/__init__.py
+++ b/bootstrapvz/providers/azure/__init__.py
@@ -2,13 +2,9 @@ from bootstrapvz.common import task_groups
 import tasks.packages
 import tasks.boot
 import tasks.image
-from bootstrapvz.common.tasks import volume
 from bootstrapvz.common.tasks import loopback
-from bootstrapvz.common.tasks import partitioning
-from bootstrapvz.common.tasks import filesystem
 from bootstrapvz.common.tasks import initd
 from bootstrapvz.common.tasks import ssh
-from bootstrapvz.common.tasks import workspace
 
 
 def initialize():
diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py
index 3e91096..3b03da8 100644
--- a/bootstrapvz/providers/ec2/__init__.py
+++ b/bootstrapvz/providers/ec2/__init__.py
@@ -12,9 +12,7 @@ from bootstrapvz.common.tasks import volume
 from bootstrapvz.common.tasks import filesystem
 from bootstrapvz.common.tasks import boot
 from bootstrapvz.common.tasks import initd
-from bootstrapvz.common.tasks import partitioning
 from bootstrapvz.common.tasks import loopback
-from bootstrapvz.common.tasks import workspace
 
 
 def initialize():
diff --git a/bootstrapvz/providers/gce/__init__.py b/bootstrapvz/providers/gce/__init__.py
index fd53d66..b705c20 100644
--- a/bootstrapvz/providers/gce/__init__.py
+++ b/bootstrapvz/providers/gce/__init__.py
@@ -1,4 +1,4 @@
-import bootstrapvz.common.task_groups
+from bootstrapvz.common import task_groups
 import tasks.apt
 import tasks.boot
 import tasks.configuration
@@ -7,7 +7,6 @@ import tasks.host
 import tasks.packages
 from bootstrapvz.common.tasks import loopback
 from bootstrapvz.common.tasks import ssh
-from bootstrapvz.common.tasks import initd
 import bootstrapvz.plugins.cloud_init.tasks
 
 
@@ -21,33 +20,33 @@ def validate_manifest(data, validator, error):
 	validator(data, schema_path)
 
 
-def resolve_tasks(tasklist, manifest):
-	tasklist.update(bootstrapvz.common.task_groups.get_standard_groups(manifest))
+def resolve_tasks(taskset, manifest):
+	taskset.update(task_groups.get_standard_groups(manifest))
 
-	tasklist.update([bootstrapvz.plugins.cloud_init.tasks.AddBackports,
-	                 loopback.Create,
-	                 tasks.apt.SetPackageRepositories,
-	                 tasks.apt.ImportGoogleKey,
-	                 tasks.packages.DefaultPackages,
-	                 tasks.packages.GooglePackages,
-	                 tasks.packages.InstallGSUtil,
+	taskset.update([bootstrapvz.plugins.cloud_init.tasks.AddBackports,
+	                loopback.Create,
+	                tasks.apt.SetPackageRepositories,
+	                tasks.apt.ImportGoogleKey,
+	                tasks.packages.DefaultPackages,
+	                tasks.packages.GooglePackages,
+	                tasks.packages.InstallGSUtil,
 
-	                 tasks.configuration.GatherReleaseInformation,
+	                tasks.configuration.GatherReleaseInformation,
 
-	                 tasks.host.DisableIPv6,
-	                 tasks.boot.ConfigureGrub,
-	                 ssh.AddSSHKeyGeneration,
-	                 tasks.apt.CleanGoogleRepositoriesAndKeys,
+	                tasks.host.DisableIPv6,
+	                tasks.boot.ConfigureGrub,
+	                ssh.AddSSHKeyGeneration,
+	                tasks.apt.CleanGoogleRepositoriesAndKeys,
 
-	                 loopback.MoveImage,
-	                 tasks.image.CreateTarball,
-	                 ])
+	                loopback.MoveImage,
+	                tasks.image.CreateTarball,
+	                ])
 
 	if 'gcs_destination' in manifest.image:
-		tasklist.add(tasks.image.UploadImage)
+		taskset.add(tasks.image.UploadImage)
 		if 'gce_project' in manifest.image:
-			tasklist.add(tasks.image.RegisterImage)
+			taskset.add(tasks.image.RegisterImage)
 
 
-def resolve_rollback_tasks(tasklist, manifest, completed, counter_task):
+def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
 	taskset.update(task_groups.get_standard_rollback_tasks(completed))
diff --git a/bootstrapvz/providers/kvm/__init__.py b/bootstrapvz/providers/kvm/__init__.py
index 1efc41f..f09b464 100644
--- a/bootstrapvz/providers/kvm/__init__.py
+++ b/bootstrapvz/providers/kvm/__init__.py
@@ -1,12 +1,8 @@
 from bootstrapvz.common import task_groups
 import tasks.packages
-from bootstrapvz.common.tasks import volume
 from bootstrapvz.common.tasks import loopback
-from bootstrapvz.common.tasks import partitioning
-from bootstrapvz.common.tasks import filesystem
 from bootstrapvz.common.tasks import initd
 from bootstrapvz.common.tasks import ssh
-from bootstrapvz.common.tasks import workspace
 
 
 def initialize():
diff --git a/bootstrapvz/providers/virtualbox/__init__.py b/bootstrapvz/providers/virtualbox/__init__.py
index b22cc08..0ba1c1e 100644
--- a/bootstrapvz/providers/virtualbox/__init__.py
+++ b/bootstrapvz/providers/virtualbox/__init__.py
@@ -1,10 +1,6 @@
 from bootstrapvz.common import task_groups
 import tasks.packages
-from bootstrapvz.common.tasks import volume
 from bootstrapvz.common.tasks import loopback
-from bootstrapvz.common.tasks import partitioning
-from bootstrapvz.common.tasks import filesystem
-from bootstrapvz.common.tasks import workspace
 
 
 def initialize():