removing arbitrary namespacing for rework