Cursors cleanup

Created by  pmeunier  on March 1, 2021
GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC
Change contents