remove some more yaw+90 kluges