Removing leftover namespace and use declarations. Removing a few more namespace delimeters.