HELP unswaddling

My lo is sleep trained already (sleeps I. Her crib, falls asleep on her own) my problem is we are still swaddling, but need to stop soon because she is getting ready to roll over. Whenever I don't swaddle her she will eat her hands and not go to sleep, so how do I stop swaddling but also get her to not suck on her hands !