Removes unnecessary namespacing