Add some height info to the map.
Remove dead variables and more tabs.