Cleanup of unused pages/apis and navbar reorg