Further cleanup of unused variables.
Merge branch 'feature/hyper' of github.com:TimDomino/navigation-viewing-framework into feature/hyper