Clean up namespaces and requires