Performance bumps, cleanup
More cleanup, simpler navigate url building
More cleanup, removed unused code
1.7.0