Update namespace and remove superfluous functions