Actually you can still use it, till she starts rolling. You can also slowly wean off the swaddle. Try taking one hand out first, then if she can sleep through with that, take out both hands, and finally, the legs. To solve the eye rubbing thing, what I usually do when I put her in bed is to help her put the hands at the sides of her head, and hold them there for a while till she’s completely asleep. Then I let go and slowly leave the room. I trained my daughter over the course of a few weeks.. now she can sleep without the swaddle and the Moro reflex is much weaker:)