Removing more leftover namespace delimeters