remove X<> where they are probably wrong