I would focus on getting her to self-settle wrapped first, then worry about getting rid of the wrap.

Have a look here for a discussion about getting rid of the wrap for my DS.