JBH Remove Nav

**Not ready for review/merge**