remove unused context data, fix nav