Removing obsolete namespaces and calls