Namespace and import cleanup.
Remove unneeded diagnostics page.