diff --git a/arch/arm64/kernel/include/arch-memory.h b/arch/arm64/kernel/include/arch-memory.h
index 1ebf771a..eaccf9e5 100644
--- a/arch/arm64/kernel/include/arch-memory.h
+++ b/arch/arm64/kernel/include/arch-memory.h
@@ -785,6 +785,16 @@ static inline int page_is_contiguous_tail(pte_t *ptep, size_t pgsize)
 	return (ptr == ptep);
 }
 
+/* Return true if PTE doesn't belong to a contiguous PTE group or PTE
+ * is the head of a contiguous PTE group
+ */
+static inline int pte_is_head(pte_t *ptep, pte_t *old, size_t cont_size)
+{
+	if (!pte_is_contiguous(old))
+		return 1;
+	return page_is_contiguous_head(ptep, cont_size);
+}
+
 struct page_table;
 void arch_adjust_allocate_page_size(struct page_table *pt,
 				    uintptr_t fault_addr,
diff --git a/arch/arm64/kernel/memory.c b/arch/arm64/kernel/memory.c
index 55159a1f..2361c6f8 100644
--- a/arch/arm64/kernel/memory.c
+++ b/arch/arm64/kernel/memory.c
@@ -2135,6 +2135,19 @@ int visit_pte_range_safe(page_table_t pt, void *start0, void *end0,
 	return initial_lookup.walk(tt, 0, start, end, initial_lookup.callback,
 				   &args);
 }
+
+static void unmap_free_stat(struct page *page, unsigned long phys,
+			    size_t free_size, const char *func)
+{
+	if (!page || page_unmap(page)) {
+		ihk_mc_free_pages_user(phys_to_virt(phys),
+				       free_size >> PAGE_SHIFT);
+		dkprintf("%lx-,%s: memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n",
+			 phys, func, phys, free_size, free_size);
+		memory_stat_rss_sub(free_size, free_size);
+	}
+}
+
 struct clear_range_args {
 	int free_physical;
 	struct memobj *memobj;
@@ -2147,10 +2160,19 @@ static int clear_range_middle(void *args0, pte_t *ptep, uint64_t base,
 static int clear_range_l1(void *args0, pte_t *ptep, uint64_t base,
 		uint64_t start, uint64_t end)
 {
+	const struct table {
+		unsigned long pgsize;
+		unsigned long cont_pgsize;
+	} tbl = {
+		.pgsize = PTL1_SIZE,
+		.cont_pgsize = PTL1_CONT_SIZE
+	};
+
 	struct clear_range_args *args = args0;
 	uint64_t phys = 0;
 	struct page *page;
 	pte_t old;
+	size_t clear_size;
 
 	//dkprintf("%s: %lx,%lx,%lx\n", __FUNCTION__, base, start, end);
 
@@ -2168,54 +2190,19 @@ static int clear_range_l1(void *args0, pte_t *ptep, uint64_t base,
 		page = phys_to_page(phys);
 	}
 
-	if (page) {
-		dkprintf("%s: page=%p,is_in_memobj=%d,(old & PTE_DIRTY)=%lx,memobj=%p,args->memobj->flags=%x\n",
-			 __func__, page, page_is_in_memobj(page),
-			 (old & PTE_DIRTY), args->memobj,
-			 args->memobj ? args->memobj->flags : -1);
-	}
-	if (page && page_is_in_memobj(page) &&
-	    ptl1_dirty(&old) && args->memobj &&
-	    !(args->memobj->flags & (MF_ZEROFILL | MF_PRIVATE))) {
-		memobj_flush_page(args->memobj, phys, PTL1_SIZE);
+	clear_size = pte_is_contiguous(&old) ?
+		tbl.cont_pgsize : tbl.pgsize;
+
+	if (ptl1_dirty(&old) &&
+	    is_flushable(page, args->memobj) &&
+	    pte_is_head(ptep, &old, tbl.cont_pgsize)) {
+		memobj_flush_page(args->memobj, phys, clear_size);
 	}
 
-	if (!ptl1_fileoff(&old)) {
-		if (args->free_physical) {
-			if (!page) {
-				/* Anonymous || !XPMEM attach */
-				if (!args->memobj ||
-				    !(args->memobj->flags & MF_XPMEM)) {
-					ihk_mc_free_pages_user(phys_to_virt(phys),
-							       1);
-					dkprintf("%s: freeing regular page at 0x%lx\n",
-						 __func__, base);
-					dkprintf("%lx-,%s: calling memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n",
-						 pte_get_phys(&old),
-						 __func__, pte_get_phys(&old),
-						 PTL1_SIZE, PTL1_SIZE);
-					memory_stat_rss_sub(PTL1_SIZE,
-							    PTL1_SIZE);
-				} else {
-					dkprintf("%s: XPMEM attach,phys=%lx\n",
-						 __func__, phys);
-				}
-			} else if (page_unmap(page)) {
-				ihk_mc_free_pages_user(phys_to_virt(phys), 1);
-				dkprintf("%s: freeing file-backed page at 0x%lx\n",
-					 __func__, base);
-				/* Track page->count for !MF_PREMAP pages */
-				dkprintf("%lx-,%s: calling memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n",
-					 pte_get_phys(&old), __func__,
-					 pte_get_phys(&old), PTL1_SIZE,
-					 PTL1_SIZE);
-				rusage_memory_stat_sub(args->memobj,
-						       PTL1_SIZE, PTL1_SIZE);
-			}
-		} else {
-			dkprintf("%s: !calling memory_stat_rss_sub(),virt=%lx,phys=%lx\n",
-				 __func__, base, pte_get_phys(&old));
-		}
+	if (!ptl1_fileoff(&old) && args->free_physical &&
+	    is_freeable(args->memobj) &&
+	    pte_is_head(ptep, &old, tbl.cont_pgsize)) {
+		unmap_free_stat(page, phys, clear_size, __func__);
 	}
 	
 	return 0;
@@ -2246,10 +2233,11 @@ static int clear_range_middle(void *args0, pte_t *ptep, uint64_t base,
 		walk_pte_t* walk;
 		walk_pte_fn_t* callback;
 		unsigned long pgsize;
+		unsigned long cont_pgsize;
 	} table[] = {
-		{walk_pte_l1, clear_range_l1, PTL2_SIZE}, /*PTL2*/
-		{walk_pte_l2, clear_range_l2, PTL3_SIZE}, /*PTL3*/
-		{walk_pte_l3, clear_range_l3, PTL4_SIZE}, /*PTL4*/
+		{walk_pte_l1, clear_range_l1, PTL2_SIZE, PTL2_CONT_SIZE}, /*PTL2*/
+		{walk_pte_l2, clear_range_l2, PTL3_SIZE, PTL3_CONT_SIZE}, /*PTL3*/
+		{walk_pte_l3, clear_range_l3, PTL4_SIZE, PTL4_CONT_SIZE}, /*PTL4*/
 	};
 	const struct table tbl = table[level-2];
 
@@ -2259,6 +2247,7 @@ static int clear_range_middle(void *args0, pte_t *ptep, uint64_t base,
 	int error;
 	struct page *page;
 	pte_t old;
+	size_t clear_size;
 
 	//dkprintf("%s: %lx,%lx,%lx\n", __FUNCTION__, base, start, end);
 
@@ -2285,49 +2274,18 @@ static int clear_range_middle(void *args0, pte_t *ptep, uint64_t base,
 			page = phys_to_page(phys);
 		}
 
-		if (page && page_is_in_memobj(page) &&
-		    ptl_dirty(&old, level) && args->memobj &&
-		    !(args->memobj->flags & (MF_ZEROFILL | MF_PRIVATE))) {
-			memobj_flush_page(args->memobj, phys, tbl.pgsize);
+		clear_size = pte_is_contiguous(&old) ?
+			tbl.cont_pgsize : tbl.pgsize;
+
+		if (ptl_dirty(&old, level) &&
+		    is_flushable(page, args->memobj) &&
+		    pte_is_head(ptep, &old, tbl.cont_pgsize)) {
+			memobj_flush_page(args->memobj, phys, clear_size);
 		}
 
-		if (!ptl_fileoff(&old, level)) {
-			if (args->free_physical) {
-				if (!page) {
-					/* Anonymous || !XPMEM attach */
-					if (!args->memobj ||
-					    !(args->memobj->flags & MF_XPMEM)) {
-						ihk_mc_free_pages_user(phys_to_virt(phys),
-								       tbl.pgsize / PAGE_SIZE);
-						dkprintf("%s: freeing large page at 0x%lx\n",
-							 __func__, base);
-						dkprintf("%lx-,%s: memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n",
-							 pte_get_phys(&old),
-							 __func__,
-							 pte_get_phys(&old),
-							 tbl.pgsize,
-							 tbl.pgsize);
-						memory_stat_rss_sub(tbl.pgsize,
-								    tbl.pgsize);
-					} else {
-						dkprintf("%s: XPMEM attach,phys=%lx\n",
-							 __func__, phys);
-					}
-				} else if (page_unmap(page)) {
-					ihk_mc_free_pages_user(phys_to_virt(phys),
-							       tbl.pgsize / PAGE_SIZE);
-					dkprintf("%s: having unmapped page-struct, freeing large page at 0x%lx\n",
-						 __func__, base);
-					/* Track page->count for !MF_PREMAP pages */
-					dkprintf("%lx-,%s: calling memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n",
-						 pte_get_phys(&old), __func__,
-						 pte_get_phys(&old),
-						 tbl.pgsize, tbl.pgsize);
-					rusage_memory_stat_sub(args->memobj,
-							       tbl.pgsize,
-							       tbl.pgsize);
-				}
-			}
+		if (!ptl_fileoff(&old, level) && args->free_physical &&
+		    pte_is_head(ptep, &old, tbl.cont_pgsize)) {
+			unmap_free_stat(page, phys, clear_size, __func__);
 		}
 
 		return 0;
diff --git a/kernel/include/memobj.h b/kernel/include/memobj.h
index 1ef1a266..ad5cb5a0 100644
--- a/kernel/include/memobj.h
+++ b/kernel/include/memobj.h
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <list.h>
 #include <pager.h>
+#include <page.h>
 
 enum {
 	/* for memobj.flags */
@@ -153,4 +154,31 @@ int hugefileobj_create(struct memobj *obj, size_t len, off_t off,
 		       int *pgshiftp, uintptr_t virt_addr);
 void hugefileobj_cleanup(void);
 
+static inline int is_flushable(struct page *page, struct memobj *memobj)
+{
+	/* Only memory with backing store needs flush */
+	if (!page || !page_is_in_memobj(page))
+		return 0;
+
+	/* memobj could be NULL when calling ihk_mc_pt_clear_range()
+	 * for range with memobj with pages.
+	 * We don't call .flush_page for /dev/shm/ map.
+	 */
+	if (!memobj || (memobj->flags & (MF_ZEROFILL | MF_PRIVATE)))
+		return 0;
+
+	return 1;
+}
+
+static inline int is_freeable(struct memobj *memobj)
+{
+	/* XPMEM attachment isn't freeable because it's an additional
+	 * map to the first map of the exposed area.
+	 */
+	if (memobj && (memobj->flags & MF_XPMEM))
+		return 0;
+
+	return 1;
+}
+
 #endif /* HEADER_MEMOBJ_H */
diff --git a/kernel/process.c b/kernel/process.c
index e4b02a1c..e7b7005a 100644
--- a/kernel/process.c
+++ b/kernel/process.c
@@ -1000,6 +1000,7 @@ int free_process_memory_range(struct process_vm *vm, struct vm_range *range)
 		if (range->memobj) {
 			memobj_ref(range->memobj);
 		}
+
 		if (range->memobj && range->memobj->flags & MF_HUGETLBFS) {
 			error = ihk_mc_pt_clear_range(vm->address_space->page_table,
 					vm, (void *)start, (void *)end);
diff --git a/kernel/shmobj.c b/kernel/shmobj.c
index 1800385a..01cdf134 100644
--- a/kernel/shmobj.c
+++ b/kernel/shmobj.c
@@ -266,17 +266,19 @@ static void shmobj_destroy(struct shmobj *obj)
 					__FUNCTION__, page->phys);
 		}
 
+		/* Other call sites of page_unmap are:
+		 * (1) MADV_REMOVE --> ... --> ihk_mc_pt_free_range()
+		 * (2) munmap --> ... --> free_process_memory_range()
+		 */
 		if (page_unmap(page)) {
+			size_t free_pgsize = 1UL << obj->pgshift;
+			size_t free_size = 1UL << obj->pgshift;
+
 			ihk_mc_free_pages_user(page_va, npages);
-			/* Track change in page->count for shmobj.
-			 * It is decremented in here or shmobj_invalidate()
-			 * or clear_range().
-			 */
 			dkprintf("%lx-,%s: calling memory_stat_rss_sub(),phys=%lx,size=%ld,pgsize=%ld\n",
-				 phys, __func__, phys, 1UL << obj->pgshift,
-				 1UL << obj->pgshift);
-			memory_stat_rss_sub(1UL << obj->pgshift,
-					    1UL << obj->pgshift);
+				 phys, __func__, phys, free_size,
+				 free_pgsize);
+			memory_stat_rss_sub(free_size, free_pgsize);
 			kfree(page);
 		}
 #if 0