Cleaning up leftover namespace and use declarations