Remove __navlist and hard-coded prefix