Remove more redundant namespacing