Remove parts of Navigation Height

- needs full removal soon

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>