remove a few more old X references