More cleanup for sub nav