diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c
index e63978aba..8ff3fb3f5 100644
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -2248,10 +2248,8 @@ static void cgfs_destroy(void *hdata)
 	if (!d)
 		return;
 	free(d->name);
-	if (d->info)
-		lxc_cgroup_process_info_free_and_remove(d->info);
-	if (d->meta)
-		lxc_cgroup_put_meta(d->meta);
+	lxc_cgroup_process_info_free_and_remove(d->info);
+	lxc_cgroup_put_meta(d->meta);
 	free(d);
 }
 
diff --git a/src/lxc/lxc_autostart.c b/src/lxc/lxc_autostart.c
index 1959e61bc..f5b9e32f9 100644
--- a/src/lxc/lxc_autostart.c
+++ b/src/lxc/lxc_autostart.c
@@ -482,7 +482,7 @@ int main(int argc, char *argv[])
 			if ( lxc_container_put(c) > 0 ) {
 				containers[i] = NULL;
 			}
-			if ( c_groups_lists && c_groups_lists[i] ) {
+			if ( c_groups_lists ) {
 				toss_list(c_groups_lists[i]);
 				c_groups_lists[i] = NULL;
 			}
@@ -501,11 +501,7 @@ int main(int argc, char *argv[])
 	}
 
 	free(c_groups_lists);
-
-	if ( cmd_groups_list ) {
-		toss_list( cmd_groups_list );
-	}
-
+	toss_list( cmd_groups_list );
 	free(containers);
 
 	return 0;
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index ee73b64c9..c7c4cf8a2 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1378,7 +1378,7 @@ out_unlock:
 	if (partial_fd >= 0)
 		remove_partial(c, partial_fd);
 out:
-	if (!ret && c)
+	if (!ret)
 		container_destroy(c);
 free_tpath:
 	free(tpath);