diff --git a/conf/stack.ini b/conf/stack.ini
index 6920283f..806c28a1 100644
--- a/conf/stack.ini
+++ b/conf/stack.ini
@@ -178,20 +178,6 @@ ec2_access_key = ${USERNAME:-demo}
 # Secret key is set in the initial keystone data to the admin password
 ec2_secret_key = ${ADMIN_PASSWORD:-secrete}
 
-[vm]
-
-# Max time till the vm is bootable
-boot_timeout = ${BOOT_TIMEOUT:-15}
-
-# Max time to wait while vm goes from build to active state
-active_timeout = ${ACTIVE_TIMEOUT:-10}
-
-# Max time from run instance command until it is running
-running_timeout = ${RUNNING_TIMEOUT:-$(vm:active_timeout)}
-
-# Max time to wait for proper IP association and dis-association.
-associate_timeout = ${ASSOCIATE_TIMEOUT:-10}
-
 [git]
 
 # Compute service git repo
@@ -292,22 +278,26 @@ port = ${HORIZON_PORT:-80}
 
 [swift]
 
-# default is APP_DIR/data
+# TBD
 data_location = ${SWIFT_DATA_LOCATION:-data}
 
+# TBD
 swift_user = ${SWIFT_USER:-root}
 
+# TBD
 swift_group = ${SWIFT_GROUP:-$(swift:swift_user)}
 
+# This specifies the fake disk size (ie a loopback device)
 loopback_disk_size = ${SWIFT_LOOPBACK_DISK_SIZE:-1000000}
 
+# TBD
 partition_power_size = ${SWIFT_PARTITION_POWER_SIZE:-9}
 
-[ci]
-
+# TBD
+#[ci]
 # CI test suite
-citest_repo = https://github.com/openstack/tempest.git
-citest_branch = master
+#citest_repo = https://github.com/openstack/tempest.git
+#citest_branch = master
 
 [img]