diff --git a/rmm/src/realm/mm/rtt.rs b/rmm/src/realm/mm/rtt.rs
index decf337446f4..7a0af5fc8e76 100644
--- a/rmm/src/realm/mm/rtt.rs
+++ b/rmm/src/realm/mm/rtt.rs
@@ -241,9 +241,6 @@ pub fn get_ripas(rd: &Rd, ipa: usize, level: usize) -> Result<u64, Error> {
     Ok(s2tte.get_ripas())
 }
 
-// FIXME: cca-rmm-acs and linux realm is using old version of entry state.
-// i.e. no differentiation between (un)assigned and (un)assigned_ns
-// while RMM spec defines each individually.
 pub fn read_entry(rd: &Rd, ipa: usize, level: usize) -> Result<[usize; 4], Error> {
     let (s2tte, last_level) = S2TTE::get_s2tte(rd, ipa, level, Error::RmiErrorRtt(0))?;
 
diff --git a/rmm/src/rmi/mod.rs b/rmm/src/rmi/mod.rs
index 59294f5f824a..b67489a69cfb 100644
--- a/rmm/src/rmi/mod.rs
+++ b/rmm/src/rmi/mod.rs
@@ -65,9 +65,6 @@ pub const ERROR_REC: usize = 3;
 pub const SUCCESS_REC_ENTER: usize = 4;
 
 // RmiRttEntryState represents the state of an RTTE
-// FIXME: cca-rmm-acs and linux realm is using old version of entry state.
-// i.e. There is no differentiation between (un)assigned and (un)assigned_ns
-// while RMM spec defines each individually.
 pub mod rtt_entry_state {
     pub const RMI_UNASSIGNED: usize = 0;
     pub const RMI_ASSIGNED: usize = 1;