Cleanup residual code from its previous life as map nav