Removed TODO as unused, cleaned up navigate a bit