More URDF cleanup