diff --git a/hypervisor/arch/x86/guest/vmcall.c b/hypervisor/arch/x86/guest/vmcall.c
index 4752fb227..8ac4129cf 100644
--- a/hypervisor/arch/x86/guest/vmcall.c
+++ b/hypervisor/arch/x86/guest/vmcall.c
@@ -24,10 +24,6 @@ int vmcall_vmexit_handler(struct vcpu *vcpu)
 	uint64_t param1 = cur_context->guest_cpu_regs.regs.rdi;
 	/* hypercall param2 from guest*/
 	uint64_t param2 = cur_context->guest_cpu_regs.regs.rsi;
-	/* hypercall param3 from guest, reserved*/
-	/* uint64_t param3 = cur_context->guest_cpu_regs.regs.rdx; */
-	/* hypercall param4 from guest, reserved*/
-	/* uint64_t param4 = cur_context->guest_cpu_regs.regs.rcx; */
 
 	if (!is_hypercall_from_ring0()) {
 		pr_err("hypercall is only allowed from RING-0!\n");
diff --git a/hypervisor/arch/x86/vmexit.c b/hypervisor/arch/x86/vmexit.c
index e23ac2f99..3e3c6b702 100644
--- a/hypervisor/arch/x86/vmexit.c
+++ b/hypervisor/arch/x86/vmexit.c
@@ -236,8 +236,6 @@ static int unhandled_vmexit_handler(struct vcpu *vcpu)
 	pr_err("Exit qualification: 0x%016llx ",
 			exec_vmread(VMX_EXIT_QUALIFICATION));
 
-	/* while(1); */
-
 	TRACE_2L(TRACE_VMEXIT_UNHANDLED, vcpu->arch_vcpu.exit_reason, 0UL);
 
 	return 0;
diff --git a/hypervisor/arch/x86/vmx.c b/hypervisor/arch/x86/vmx.c
index 02647fa79..de58b9782 100644
--- a/hypervisor/arch/x86/vmx.c
+++ b/hypervisor/arch/x86/vmx.c
@@ -635,7 +635,7 @@ static void init_guest_state(struct vcpu *vcpu)
 			}
 		} else {
 			/* AP is initialized with real mode
-			 * and CS value is left shift 8 bits from sipi vector;
+			 * and CS value is left shift 8 bits from sipi vector.
 			 */
 			sel = vcpu->arch_vcpu.sipi_vector << 8U;
 			base = sel << 4U;
diff --git a/hypervisor/lib/sprintf.c b/hypervisor/lib/sprintf.c
index 29254e77a..36c9ce13f 100644
--- a/hypervisor/lib/sprintf.c
+++ b/hypervisor/lib/sprintf.c
@@ -608,10 +608,6 @@ int do_print(const char *fmt, struct print_param *param,
 			/* pointer argument */
 			else if (ch == 'p') {
 				param->vars.flags |= PRINT_FLAG_ALTERNATE_FORM;
-				/* XXXCRG res=print_pow2(param,
-				 * (uint32_t) __builtin_va_arg(args,
-				 * void *),4);
-				 */
 				res = print_pow2(param, (uint64_t)
 					__builtin_va_arg(args, void *), 4U);
 			}