diff --git a/executer/kernel/mcctrl/control.c b/executer/kernel/mcctrl/control.c
index 3d9b4d97..db9e728e 100644
--- a/executer/kernel/mcctrl/control.c
+++ b/executer/kernel/mcctrl/control.c
@@ -567,11 +567,7 @@ static long mcexec_get_cpuset(ihk_os_t os, unsigned long arg)
 	struct mcctrl_usrdata *udp = ihk_host_os_get_usrdata(os);
 	struct mcctrl_part_exec *pe;
 	struct get_cpu_set_arg req;
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 	struct mcctrl_cpu_topology *cpu_top, *cpu_top_i;
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-	struct cpu_topology *cpu_top, *cpu_top_i;
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 	struct cache_topology *cache_top;
 	int cpu, cpus_assigned, cpus_to_assign, cpu_prev;
 	int ret = 0;
@@ -2966,13 +2962,8 @@ mcexec_uti_attr(ihk_os_t os, struct uti_attr_desc __user *_desc)
 	cpumask_t *cpuset = NULL, *env_cpuset = NULL;
 	struct mcctrl_usrdata *ud = ihk_host_os_get_usrdata(os);
 	ihk_device_t dev = ihk_os_to_dev(os);
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 	struct mcctrl_cpu_topology *cpu_topo;
 	struct mcctrl_cpu_topology *target_cpu = NULL;
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-	struct cpu_topology *cpu_topo;
-	struct cpu_topology *target_cpu = NULL;
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 	struct node_topology *node_topo;
 	struct ihk_cache_topology *lcache_topo;
 	struct ihk_node_topology *lnode_topo;
diff --git a/executer/kernel/mcctrl/mcctrl.h b/executer/kernel/mcctrl/mcctrl.h
index 46d3c189..7305db86 100644
--- a/executer/kernel/mcctrl/mcctrl.h
+++ b/executer/kernel/mcctrl/mcctrl.h
@@ -294,11 +294,7 @@ struct cache_topology {
 	struct list_head chain;
 };
 
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 struct mcctrl_cpu_topology {
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-struct cpu_topology {
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 	//struct mcctrl_usrdata *udp;
 	struct ihk_cpu_topology *saved;
 	int mckernel_cpu_id;
diff --git a/executer/kernel/mcctrl/sysfs_files.c b/executer/kernel/mcctrl/sysfs_files.c
index ebcb03ab..cf7024c8 100644
--- a/executer/kernel/mcctrl/sysfs_files.c
+++ b/executer/kernel/mcctrl/sysfs_files.c
@@ -157,13 +157,8 @@ static void free_node_topology(struct mcctrl_usrdata *udp)
 	return;
 } /* free_node_topology() */
 
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 static void free_cpu_topology_one(struct mcctrl_usrdata *udp,
 		struct mcctrl_cpu_topology *cpu)
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-static void free_cpu_topology_one(struct mcctrl_usrdata *udp,
-		struct cpu_topology *cpu)
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 {
 	struct cache_topology *cache;
 	struct cache_topology *next;
@@ -179,13 +174,8 @@ static void free_cpu_topology_one(struct mcctrl_usrdata *udp,
 
 static void free_cpu_topology(struct mcctrl_usrdata *udp)
 {
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 	struct mcctrl_cpu_topology *cpu;
 	struct mcctrl_cpu_topology *next;
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-	struct cpu_topology *cpu;
-	struct cpu_topology *next;
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 
 	list_for_each_entry_safe(cpu, next, &udp->cpu_topology_list, chain) {
 		list_del(&cpu->chain);
@@ -315,13 +305,8 @@ static int translate_cpumap(struct mcctrl_usrdata *udp,
 	return error;
 } /* translate_cpumap() */
 
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 static struct cache_topology *get_cache_topology(struct mcctrl_usrdata *udp,
 		struct mcctrl_cpu_topology *cpu_topo, struct ihk_cache_topology *saved)
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-static struct cache_topology *get_cache_topology(struct mcctrl_usrdata *udp,
-		struct cpu_topology *cpu_topo, struct ihk_cache_topology *saved)
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 {
 	int error;
 	struct cache_topology *topo = NULL;
@@ -355,21 +340,12 @@ out:
 	return (error)? ERR_PTR(error): topo;
 } /* get_cache_topology() */
 
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 static struct mcctrl_cpu_topology *get_one_cpu_topology(struct mcctrl_usrdata *udp,
 		int index)
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-static struct cpu_topology *get_one_cpu_topology(struct mcctrl_usrdata *udp,
-		int index)
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 {
 	int error;
 	ihk_device_t dev = ihk_os_to_dev(udp->os);
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 	struct mcctrl_cpu_topology *topology = NULL;
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-	struct cpu_topology *topology = NULL;
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 	struct cache_topology *cache;
 	struct ihk_cache_topology *saved_cache;
 
@@ -446,11 +422,7 @@ static int get_cpu_topology(struct mcctrl_usrdata *udp)
 {
 	int error;
 	int index;
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 	struct mcctrl_cpu_topology *topology;
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-	struct cpu_topology *topology;
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 
 	dprintk("get_cpu_topology(%p)\n", udp);
 	for (index = 0; index < udp->cpu_info->n_cpus; ++index) {
@@ -472,13 +444,8 @@ out:
 	return error;
 } /* get_cpu_topology() */
 
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 static void setup_cpu_sysfs_cache_files(struct mcctrl_usrdata *udp,
 		struct mcctrl_cpu_topology *cpu, struct cache_topology *cache)
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-static void setup_cpu_sysfs_cache_files(struct mcctrl_usrdata *udp,
-		struct cpu_topology *cpu, struct cache_topology *cache)
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 {
 	char *prefix = "/sys/devices/system/cpu";
 	int cpu_number = cpu->mckernel_cpu_id;
@@ -530,13 +497,8 @@ static void setup_cpu_sysfs_cache_files(struct mcctrl_usrdata *udp,
 	return;
 } /* setup_cpu_sysfs_cache_files() */
 
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 static void setup_cpu_sysfs_files(struct mcctrl_usrdata *udp,
 		struct mcctrl_cpu_topology *cpu)
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-static void setup_cpu_sysfs_files(struct mcctrl_usrdata *udp,
-		struct cpu_topology *cpu)
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 {
 	char *prefix = "/sys/devices/system/cpu";
 	int cpu_number = cpu->mckernel_cpu_id;
@@ -585,11 +547,7 @@ static void setup_cpu_sysfs_files(struct mcctrl_usrdata *udp,
 static void setup_cpus_sysfs_files(struct mcctrl_usrdata *udp)
 {
 	int error;
-#ifdef POSTK_DEBUG_ARCH_DEP_40 /* cpu_topology name change */
 	struct mcctrl_cpu_topology *cpu;
-#else /* POSTK_DEBUG_ARCH_DEP_40 */
-	struct cpu_topology *cpu;
-#endif /* POSTK_DEBUG_ARCH_DEP_40 */
 
 	error = get_cpu_topology(udp);
 	if (error) {