Merge "Remove import/export from side nav"