Cleanup namespaces and imports