Dropped support for namespaces and updated docs and tests